Merge commit 'v2.6.32' into reiserfs/kill-bkl

[karo-tx-linux.git] / drivers / rtc / rtc-ds1307.c

diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
index 47a93c022d91b20bc840bd8158bb1097514eaa7b..eb99ee4fa0f5778a39e4faddd892766b06d0f078 100644 (file)
--- a/drivers/rtc/rtc-ds1307.c
+++ b/drivers/rtc/rtc-ds1307.c
@@ -896,8 +896,7 @@ read_rtc:
        return 0;
 
 exit_irq:
-       if (ds1307->rtc)
-               rtc_device_unregister(ds1307->rtc);
+       rtc_device_unregister(ds1307->rtc);
 exit_free:
        kfree(ds1307);
        return err;