Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/sc…

…m/linux/kernel/git/tip/tip

Pull timer fix from Thomas Gleixner.

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  rtc: Fix possible null pointer dereference in rtc-mpc5121.c
  • Loading branch information...
commit f756beba940ca21755396851521463d494893566 2 parents c6de168 + e48b5e8
@torvalds torvalds authored
Showing with 1 addition and 2 deletions.
  1. +1 −2  drivers/rtc/rtc-mpc5121.c
View
3  drivers/rtc/rtc-mpc5121.c
@@ -360,12 +360,11 @@ static int __devinit mpc5121_rtc_probe(struct platform_device *op)
&mpc5200_rtc_ops, THIS_MODULE);
}
- rtc->rtc->uie_unsupported = 1;
-
if (IS_ERR(rtc->rtc)) {
err = PTR_ERR(rtc->rtc);
goto out_free_irq;
}
+ rtc->rtc->uie_unsupported = 1;
return 0;
Please sign in to comment.
Something went wrong with that request. Please try again.