diff options
| author |   Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2017-10-13 00:06:45 +0200 |
|---|---|---|
| committer | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2017-10-31 17:31:13 +0100 |
| commit | 57072758623fa4f3019bce65e2b00f24af8dfdd7 (patch) | |
| tree | 97e3d055a72a163bce5cf517450643281913b435 /drivers/rtc | |
| parent | rtc: omap: fix error path when pinctrl_register fails (diff) | |
| download | linux-dev-57072758623fa4f3019bce65e2b00f24af8dfdd7.tar.xz linux-dev-57072758623fa4f3019bce65e2b00f24af8dfdd7.zip | |
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: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Diffstat (limited to 'drivers/rtc')
| -rw-r--r-- | drivers/rtc/rtc-omap.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c index 3bdc041fc2e9..d56d937966dc 100644 --- a/drivers/rtc/rtc-omap.c +++ b/drivers/rtc/rtc-omap.c @@ -797,13 +797,14 @@ static int omap_rtc_probe(struct platform_device *pdev) device_init_wakeup(&pdev->dev, true); - rtc->rtc = devm_rtc_device_register(&pdev->dev, pdev->name, - &omap_rtc_ops, THIS_MODULE); + rtc->rtc = devm_rtc_allocate_device(&pdev->dev); if (IS_ERR(rtc->rtc)) { ret = PTR_ERR(rtc->rtc); goto err; } + rtc->rtc->ops = &omap_rtc_ops; + /* handle periodic and alarm irqs */ ret = devm_request_irq(&pdev->dev, rtc->irq_timer, rtc_irq, 0, dev_name(&rtc->rtc->dev), rtc); @@ -834,6 +835,10 @@ static int omap_rtc_probe(struct platform_device *pdev) goto err; } + ret = rtc_register_device(rtc->rtc); + if (ret) + goto err; + return 0; err: |