Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

torvalds · torvalds · commit f756beba940c · 2012-05-04T15:35:09.000-07:00
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
diff --git 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;
 

Original file line number	Diff line number	Diff line change
`@@ -360,12 +360,11 @@ static int __devinit mpc5121_rtc_probe(struct platform_device *op)`
`360`	`360`	`&mpc5200_rtc_ops, THIS_MODULE);`
`361`	`361`	`}`
`362`	`362`
`363`		`- rtc->rtc->uie_unsupported = 1;`
`364`		`-`
`365`	`363`	`if (IS_ERR(rtc->rtc)) {`
`366`	`364`	`err = PTR_ERR(rtc->rtc);`
`367`	`365`	`goto out_free_irq;`
`368`	`366`	`}`
	`367`	`+ rtc->rtc->uie_unsupported = 1;`
`369`	`368`
`370`	`369`	`return 0;`
`371`	`370`