summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2013-07-03 15:07:04 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-03 16:07:54 -0700
commit812f147853a14812b260620b19e0764cdeb71b4c (patch)
tree98478df5dc6bde254d7d6c34b74064cc551682c0
parent1df0a4711f6e93c1073dd82f6e7905748842e2b3 (diff)
downloadblackbird-op-linux-812f147853a14812b260620b19e0764cdeb71b4c.tar.gz
blackbird-op-linux-812f147853a14812b260620b19e0764cdeb71b4c.zip
drivers/rtc/rtc-vr41xx.c: fix error return code in rtc_probe()
Fix to return -EBUSY in the platform irq get error handling case instead of 0, as done elsewhere in this function. Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/rtc/rtc-vr41xx.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-vr41xx.c b/drivers/rtc/rtc-vr41xx.c
index 3b5b4fa9a6e9..54e104e197e3 100644
--- a/drivers/rtc/rtc-vr41xx.c
+++ b/drivers/rtc/rtc-vr41xx.c
@@ -339,8 +339,10 @@ static int rtc_probe(struct platform_device *pdev)
goto err_device_unregister;
pie_irq = platform_get_irq(pdev, 1);
- if (pie_irq <= 0)
+ if (pie_irq <= 0) {
+ retval = -EBUSY;
goto err_free_irq;
+ }
retval = request_irq(pie_irq, rtclong1_interrupt, 0,
"rtclong1", pdev);
OpenPOWER on IntegriCloud