diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-10-06 11:36:55 -0400 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-10-06 11:36:55 -0400 |
| commit | d94e5fcbf1420366dcb4102bafe04dbcfc0d0d4b (patch) | |
| tree | a9b7de7df6da5c3132cc68169b9c47ba288ccd42 /drivers/rtc/rtc-ds1307.c | |
| parent | d55651168a20078a94597a297d5cdfd807bf07b6 (diff) | |
| parent | 374576a8b6f865022c0fd1ca62396889b23d66dd (diff) | |
Merge commit 'v2.6.32-rc3'
Diffstat (limited to 'drivers/rtc/rtc-ds1307.c')
| -rw-r--r-- | drivers/rtc/rtc-ds1307.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c index 47a93c022d91..eb99ee4fa0f5 100644 --- a/drivers/rtc/rtc-ds1307.c +++ b/drivers/rtc/rtc-ds1307.c | |||
| @@ -896,8 +896,7 @@ read_rtc: | |||
| 896 | return 0; | 896 | return 0; |
| 897 | 897 | ||
| 898 | exit_irq: | 898 | exit_irq: |
| 899 | if (ds1307->rtc) | 899 | rtc_device_unregister(ds1307->rtc); |
| 900 | rtc_device_unregister(ds1307->rtc); | ||
| 901 | exit_free: | 900 | exit_free: |
| 902 | kfree(ds1307); | 901 | kfree(ds1307); |
| 903 | return err; | 902 | return err; |