diff options
| author | Colin Cross <ccross@android.com> | 2010-10-15 12:03:22 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2010-10-15 12:03:22 -0700 |
| commit | 89c37cce1c850fe046df50ccb923a8eccbf259b6 (patch) | |
| tree | 214c7beca34ca9fd72493001121599291ea1300d /drivers/rtc | |
| parent | 43ca7cdda2e511be7d19c3bdbc437e471b7e8f7e (diff) | |
| parent | cd07202cc8262e1669edff0d97715f3dd9260917 (diff) | |
Merge commit 'v2.6.36-rc8' into linux-tegra-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; } |