From b9a857c2b36927e0d360c102b5e2a14ad8848021 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Tue, 22 Sep 2009 16:46:29 -0700
Subject: [PATCH] --- yaml --- r: 164809 b: refs/heads/master c:
 72445af880dbcd41cffd0d7b78a8c74da093e9eb h: refs/heads/master i:   164807:
 0fe60ec2b2258efc53b79cf5d38f4852a299d8e7 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/rtc/rtc-ds1307.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a9c98493b993..6dd9be001e5e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d3c7a3f71a103abb7af5bdaf1adf6f693913a4a9
+refs/heads/master: 72445af880dbcd41cffd0d7b78a8c74da093e9eb
diff --git a/trunk/drivers/rtc/rtc-ds1307.c b/trunk/drivers/rtc/rtc-ds1307.c
index 47a93c022d91..eb99ee4fa0f5 100644
--- a/trunk/drivers/rtc/rtc-ds1307.c
+++ b/trunk/drivers/rtc/rtc-ds1307.c
@@ -896,8 +896,7 @@ static int __devinit ds1307_probe(struct i2c_client *client,
 	return 0;
 
 exit_irq:
-	if (ds1307->rtc)
-		rtc_device_unregister(ds1307->rtc);
+	rtc_device_unregister(ds1307->rtc);
 exit_free:
 	kfree(ds1307);
 	return err;