drivers/rtc/rtc-ds1307.c: fix sysfs wakealarm attribute creation

In order to allow the creation of the sysfs attribute wakealarm, this
patch moves the device_set_wakeup_capable() call above the RTC device
registration.

Signed-off-by: Simon Guinot <[email protected]>
Cc: Jason Cooper <[email protected]>
Cc: Andrew Lunn <[email protected]>
Cc: Gregory Clement <[email protected]>
Cc: Sebastian Hesselbarth <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
index 9e2aad68f96da5f0b560d979f021dac9007b04d3..f739be96cbc090a292c1cee095702978cf9d3a77 100644 (file)
--- a/drivers/rtc/rtc-ds1307.c
+++ b/drivers/rtc/rtc-ds1307.c
@@ -927,6 +927,7 @@ read_rtc:
                                bin2bcd(tmp));
        }
 
+       device_set_wakeup_capable(&client->dev, want_irq);
        ds1307->rtc = devm_rtc_device_register(&client->dev, client->name,
                                &ds13xx_rtc_ops, THIS_MODULE);
        if (IS_ERR(ds1307->rtc)) {
@@ -941,7 +942,6 @@ read_rtc:
                        dev_err(&client->dev, "unable to request IRQ!\n");
                } else {
 
-                       device_set_wakeup_capable(&client->dev, 1);
                        set_bit(HAS_ALARM, &ds1307->flags);
                        dev_dbg(&client->dev, "got IRQ %d\n", client->irq);
                }