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
This commit is contained in:
Коммит
f756beba94
|
@ -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;
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче