leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rtc: omap: switch to rtc_register_device

Browse Source 
This removes a possible race condition and crash and allows for further
improvement of the driver.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
This commit is contained in:
Alexandre Belloni 2017-10-13 00:06:45 +02:00
parent 26e480f7bb
commit 5707275862
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/rtc/rtc-omap.c
View File

@ -797,13 +797,14 @@ static int omap_rtc_probe(struct platform_device *pdev)
device_init_wakeup(&pdev->dev, true); device_init_wakeup(&pdev->dev, true);
rtc->rtc = devm_rtc_device_register(&pdev->dev, pdev->name, rtc->rtc = devm_rtc_allocate_device(&pdev->dev);
&omap_rtc_ops, THIS_MODULE);
if (IS_ERR(rtc->rtc)) { if (IS_ERR(rtc->rtc)) {
ret = PTR_ERR(rtc->rtc); ret = PTR_ERR(rtc->rtc);
goto err; goto err;
} }
rtc->rtc->ops = &omap_rtc_ops;
/* handle periodic and alarm irqs */ /* handle periodic and alarm irqs */
ret = devm_request_irq(&pdev->dev, rtc->irq_timer, rtc_irq, 0, ret = devm_request_irq(&pdev->dev, rtc->irq_timer, rtc_irq, 0,
dev_name(&rtc->rtc->dev), rtc); dev_name(&rtc->rtc->dev), rtc);
@ -834,6 +835,10 @@ static int omap_rtc_probe(struct platform_device *pdev)
goto err; goto err;
} }
ret = rtc_register_device(rtc->rtc);
if (ret)
goto err;
return 0; return 0;
err: err: