timers: fixes for 3.4
Linus,
please pull the latest timers-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers-urgent-for-linus
Thanks,
tglx
------------------>
John Stultz (1):
rtc: Fix possible null pointer dereference in rtc-mpc5121.c
drivers/rtc/rtc-mpc5121.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
drivers/rtc/rtc-mpc5121.c +1 -2
@@ -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 ;