From 707de12c43f136a15fe295703106347a27d9fbe2 Mon Sep 17 00:00:00 2001
From: Wan ZongShun <mcuos.com@gmail.com>
Date: Tue, 10 Aug 2010 18:02:09 -0700
Subject: [PATCH] --- yaml --- r: 208457 b: refs/heads/master c:
 4faf896c5e860b55b7444976225ff5ba85c0b286 h: refs/heads/master i:   208455:
 82463bbc3820424bcce402caa26207eda15bd60c v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/rtc/rtc-m48t59.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c26a90684e27..d069764e7014 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5737cb5150f08b2cf216a7b5f615800b3a75260
+refs/heads/master: 4faf896c5e860b55b7444976225ff5ba85c0b286
diff --git a/trunk/drivers/rtc/rtc-m48t59.c b/trunk/drivers/rtc/rtc-m48t59.c
index be8359fdb65a..0b6645509c86 100644
--- a/trunk/drivers/rtc/rtc-m48t59.c
+++ b/trunk/drivers/rtc/rtc-m48t59.c
@@ -506,7 +506,6 @@ static int __devinit m48t59_rtc_probe(struct platform_device *pdev)
 		free_irq(m48t59->irq, &pdev->dev);
 	if (m48t59->ioaddr)
 		iounmap(m48t59->ioaddr);
-	if (m48t59)
 		kfree(m48t59);
 	return ret;
 }