mirror of
https://github.com/Fishwaldo/linux-bl808.git
synced 2025-03-27 17:35:35 +00:00
rtc: ds1307: 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>
This commit is contained in:
parent
2a52482ffb
commit
69b119a642
1 changed files with 7 additions and 2 deletions
|
@ -1674,8 +1674,8 @@ read_rtc:
|
|||
device_set_wakeup_capable(ds1307->dev, true);
|
||||
set_bit(HAS_ALARM, &ds1307->flags);
|
||||
}
|
||||
ds1307->rtc = devm_rtc_device_register(ds1307->dev, ds1307->name,
|
||||
rtc_ops, THIS_MODULE);
|
||||
|
||||
ds1307->rtc = devm_rtc_allocate_device(ds1307->dev);
|
||||
if (IS_ERR(ds1307->rtc)) {
|
||||
return PTR_ERR(ds1307->rtc);
|
||||
}
|
||||
|
@ -1737,6 +1737,11 @@ read_rtc:
|
|||
}
|
||||
}
|
||||
|
||||
ds1307->rtc->ops = rtc_ops;
|
||||
err = rtc_register_device(ds1307->rtc);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
ds1307_hwmon_register(ds1307);
|
||||
ds1307_clks_register(ds1307);
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue