diff options
| author | Dima Zavin <dima@android.com> | 2010-10-21 15:00:17 -0700 |
|---|---|---|
| committer | Dima Zavin <dima@android.com> | 2010-10-21 15:00:17 -0700 |
| commit | 5ff1b9cdb1791cab2759a2a073f0ba6b24579bc3 (patch) | |
| tree | b375bea8dbd645df03a14a74481918b4f6657867 /drivers/rtc | |
| parent | d3c5752794d700393fc3ba5ad4eb4b09c269b23c (diff) | |
| parent | f6f94e2ab1b33f0082ac22d71f66385a60d8157f (diff) | |
Merge commit 'v2.6.36' into android-2.6.36
Diffstat (limited to 'drivers/rtc')
| -rw-r--r-- | drivers/rtc/rtc-ds3232.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-ds3232.c b/drivers/rtc/rtc-ds3232.c index 9daed8db83d3..9de8516e3531 100644 --- a/drivers/rtc/rtc-ds3232.c +++ b/drivers/rtc/rtc-ds3232.c @@ -268,7 +268,6 @@ out_irq: free_irq(client->irq, client); out_free: - i2c_set_clientdata(client, NULL); kfree(ds3232); return ret; } @@ -287,7 +286,6 @@ static int __devexit ds3232_remove(struct i2c_client *client) } rtc_device_unregister(ds3232->rtc); - i2c_set_clientdata(client, NULL); kfree(ds3232); return 0; } |