1 files changed, 6 insertions, 5 deletions

diff --git a/drivers/rtc/rtc-ds1374.c b/drivers/rtc/rtc-ds1374.c
index 32b27739ec2a..47fb6357c346 100644
--- a/drivers/rtc/rtc-ds1374.c
+++ b/drivers/rtc/rtc-ds1374.c
@@ -24,6 +24,7 @@
 #include <linux/rtc.h>
 #include <linux/bcd.h>
 #include <linux/workqueue.h>
+#include <linux/slab.h>
 
 #define DS1374_REG_TOD0         0x00 /* Time of Day */
 #define DS1374_REG_TOD1         0x01
@@ -283,7 +284,7 @@ static void ds1374_work(struct work_struct *work)
 
         stat = i2c_smbus_read_byte_data(client, DS1374_REG_SR);
         if (stat < 0)
-                return;
+                goto unlock;
 
         if (stat & DS1374_REG_SR_AF) {
                 stat &= ~DS1374_REG_SR_AF;
@@ -302,7 +303,7 @@ static void ds1374_work(struct work_struct *work)
 out:
         if (!ds1374->exiting)
                 enable_irq(client->irq);
-
+unlock:
         mutex_unlock(&ds1374->mutex);
 }
 
@@ -383,6 +384,8 @@ static int ds1374_probe(struct i2c_client *client,
                         dev_err(&client->dev, "unable to request IRQ\n");
                         goto out_free;
                 }
+
+                device_set_wakeup_capable(&client->dev, 1);
         }
 
         ds1374->rtc = rtc_device_register(client->name, &client->dev,
@@ -400,7 +403,6 @@ out_irq:
                 free_irq(client->irq, client);
 
 out_free:
-        i2c_set_clientdata(client, NULL);
         kfree(ds1374);
         return ret;
 }
@@ -415,11 +417,10 @@ static int __devexit ds1374_remove(struct i2c_client *client)
                 mutex_unlock(&ds1374->mutex);
 
                 free_irq(client->irq, client);
-                flush_scheduled_work();
+                cancel_work_sync(&ds1374->work);
         }
 
         rtc_device_unregister(ds1374->rtc);
-        i2c_set_clientdata(client, NULL);
         kfree(ds1374);
         return 0;
 }