diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2010-08-26 13:22:27 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2010-08-26 13:22:27 -0400 |
| commit | f632265d0ffb5acf331252d98c64939849d96bb2 (patch) | |
| tree | 31187d9a726bf1ca6ca12e26ad8e7c609eaf4d8b /drivers/rtc/rtc-ds1374.c | |
| parent | 7d94784293096c0a46897acdb83be5abd9278ece (diff) | |
| parent | da5cabf80e2433131bf0ed8993abc0f7ea618c73 (diff) | |
Merge commit 'v2.6.36-rc1' into HEAD
Diffstat (limited to 'drivers/rtc/rtc-ds1374.c')
| -rw-r--r-- | drivers/rtc/rtc-ds1374.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-ds1374.c b/drivers/rtc/rtc-ds1374.c index 61945734ad00..1f0007fd4431 100644 --- a/drivers/rtc/rtc-ds1374.c +++ b/drivers/rtc/rtc-ds1374.c | |||
| @@ -403,7 +403,6 @@ out_irq: | |||
| 403 | free_irq(client->irq, client); | 403 | free_irq(client->irq, client); |
| 404 | 404 | ||
| 405 | out_free: | 405 | out_free: |
| 406 | i2c_set_clientdata(client, NULL); | ||
| 407 | kfree(ds1374); | 406 | kfree(ds1374); |
| 408 | return ret; | 407 | return ret; |
| 409 | } | 408 | } |
| @@ -422,7 +421,6 @@ static int __devexit ds1374_remove(struct i2c_client *client) | |||
| 422 | } | 421 | } |
| 423 | 422 | ||
| 424 | rtc_device_unregister(ds1374->rtc); | 423 | rtc_device_unregister(ds1374->rtc); |
| 425 | i2c_set_clientdata(client, NULL); | ||
| 426 | kfree(ds1374); | 424 | kfree(ds1374); |
| 427 | return 0; | 425 | return 0; |
| 428 | } | 426 | } |