Commit 57072758 authored by Alexandre Belloni's avatar Alexandre Belloni

rtc: omap: switch to rtc_register_device

This removes a possible race condition and crash and allows for further
improvement of the driver.
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
parent 26e480f7
...@@ -797,13 +797,14 @@ static int omap_rtc_probe(struct platform_device *pdev) ...@@ -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) ...@@ -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:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment