diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-24 06:59:11 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-24 06:59:18 -0400 |
| commit | d2ff6de537c61a0f05731c6679f3e1abc2d95e68 (patch) | |
| tree | 821aa38121f57a9d5419388ef10ea6f3aa445d4d /drivers/rtc/rtc-ds1307.c | |
| parent | e23a8b6a8f319c0f08b6ccef2dccbb37e7603dc2 (diff) | |
| parent | a724eada8c2a7b62463b73ccf73fd0bb6e928aeb (diff) | |
Merge branch 'linus' into x86/urgent
Merge reason: Queueing up dependent early-printk fix.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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; |