From d881bc562980fa472e655ddf34f78e3bb728e5c3 Mon Sep 17 00:00:00 2001
From: Sachin Kamat <sachin.kamat@linaro.org>
Date: Mon, 29 Apr 2013 16:20:09 -0700
Subject: [PATCH] --- yaml --- r: 365796 b: refs/heads/master c:
 ad3f3cf489311af25f91bade664a1688896245e9 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 8ba94a82a178..c0a6283d3060 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 569b05a300dc0307ad69aaa5dbe1cf4601bb3af8
+refs/heads/master: ad3f3cf489311af25f91bade664a1688896245e9
diff --git a/trunk/drivers/rtc/rtc-tps6586x.c b/trunk/drivers/rtc/rtc-tps6586x.c
index badfea491a93..459c2ffc95a6 100644
--- a/trunk/drivers/rtc/rtc-tps6586x.c
+++ b/trunk/drivers/rtc/rtc-tps6586x.c
@@ -289,15 +289,12 @@ static int tps6586x_rtc_probe(struct platform_device *pdev)
 	if (ret < 0) {
 		dev_err(&pdev->dev, "request IRQ(%d) failed with ret %d\n",
 				rtc->irq, ret);
-		goto fail_req_irq;
+		goto fail_rtc_register;
 	}
 	disable_irq(rtc->irq);
 	device_set_wakeup_capable(&pdev->dev, 1);
 	return 0;
 
-fail_req_irq:
-	rtc_device_unregister(rtc->rtc);
-
 fail_rtc_register:
 	tps6586x_update(tps_dev, RTC_CTRL, 0,
 		RTC_ENABLE | OSC_SRC_SEL | PRE_BYPASS | CL_SEL_MASK);