AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

rtc: ds1307: fix alarm reading at probe time

Browse Source 
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>
This commit is contained in:
Simon Guinot 2015-11-26 15:37:13 +01:00 committed by Alexandre Belloni
parent 51c4cfef56
commit 3abb1ada21
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/rtc/rtc-ds1307.c
View File

@ -1134,7 +1134,10 @@ static int ds1307_probe(struct i2c_client *client,
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 @@ static int ds1307_probe(struct i2c_client *client,
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) {