aboutsummaryrefslogtreecommitdiff
path: root/drivers/rtc/rtc-ds1307.c
diff options
context:
space:
mode:
authorSimon Guinot <simon.guinot@sequanux.org>2015-11-26 15:37:13 +0100
committerAlexandre Belloni <alexandre.belloni@free-electrons.com>2015-11-26 18:11:26 +0100
commit3abb1ada21a4fb5b2920457a2e5c8483abb09a45 (patch)
tree88ead2d36f6031a3252bc5f291b738735464f336 /drivers/rtc/rtc-ds1307.c
parent51c4cfef568fe8ebac06761ed7c754fac1f9b5a8 (diff)
downloadlinux-linaro-stable-3abb1ada21a4fb5b2920457a2e5c8483abb09a45.tar.gz
rtc: ds1307: fix alarm reading at probe time
With the actual code, read_alarm() always returns -EINVAL when called during the RTC device registration. This prevents from retrieving an already configured alarm in hardware. This patch fixes the issue by moving the HAS_ALARM bit configuration (if supported by the hardware) above the rtc_device_register() call. Signed-off-by: Simon Guinot <simon.guinot@sequanux.org> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Diffstat (limited to 'drivers/rtc/rtc-ds1307.c')
-rw-r--r--drivers/rtc/rtc-ds1307.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
index 325836818826..aa705bb4748c 100644
--- a/drivers/rtc/rtc-ds1307.c
+++ b/drivers/rtc/rtc-ds1307.c
@@ -1134,7 +1134,10 @@ read_rtc:
bin2bcd(tmp));
}
- device_set_wakeup_capable(&client->dev, want_irq);
+ if (want_irq) {
+ device_set_wakeup_capable(&client->dev, true);
+ set_bit(HAS_ALARM, &ds1307->flags);
+ }
ds1307->rtc = devm_rtc_device_register(&client->dev, client->name,
rtc_ops, THIS_MODULE);
if (IS_ERR(ds1307->rtc)) {
@@ -1148,12 +1151,11 @@ read_rtc:
ds1307->rtc->name, client);
if (err) {
client->irq = 0;
+ device_set_wakeup_capable(&client->dev, false);
+ clear_bit(HAS_ALARM, &ds1307->flags);
dev_err(&client->dev, "unable to request IRQ!\n");
- } else {
-
- set_bit(HAS_ALARM, &ds1307->flags);
+ } else
dev_dbg(&client->dev, "got IRQ %d\n", client->irq);
- }
}
if (chip->nvram_size) {