aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-05-04 15:35:09 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-05-04 15:35:09 -0700
commitf756beba940ca21755396851521463d494893566 (patch)
tree95b68f7e6f8817dd9de41c99907491b5511e6594
parentc6de1687f57893df31fd5266ead3479418230a06 (diff)
parente48b5e825f9c471cbcbfd934a4c2df27e9d39635 (diff)
downloadlinux-linaro-stable-f756beba940ca21755396851521463d494893566.tar.gz
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/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
-rw-r--r--drivers/rtc/rtc-mpc5121.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-mpc5121.c b/drivers/rtc/rtc-mpc5121.c
index 42f5f829b3ee..029e421baaed 100644
--- a/drivers/rtc/rtc-mpc5121.c
+++ b/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;