summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2013-09-11 19:20:37 +0800
committerLee Jones <lee.jones@linaro.org>2013-10-23 16:20:49 +0100
commit18fefda9ee13e377cf6c5542818b7be066972843 (patch)
tree91532db88c1ef72a59605ed9574755821d47f854 /drivers
parent1a54b7dabf8f20df2894aed9683155ff89fc20e8 (diff)
downloadlinux-stable-18fefda9ee13e377cf6c5542818b7be066972843.tar.gz
linux-stable-18fefda9ee13e377cf6c5542818b7be066972843.tar.bz2
linux-stable-18fefda9ee13e377cf6c5542818b7be066972843.zip
mfd: ucb1x00-core: Fix error return code in ucb1x00_probe()
Fix to return a negative error code in the irq alloc 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: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mfd/ucb1x00-core.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mfd/ucb1x00-core.c b/drivers/mfd/ucb1x00-core.c
index d5966e6b5a7d..0313f839e8fa 100644
--- a/drivers/mfd/ucb1x00-core.c
+++ b/drivers/mfd/ucb1x00-core.c
@@ -553,6 +553,7 @@ static int ucb1x00_probe(struct mcp *mcp)
if (ucb->irq_base < 0) {
dev_err(&ucb->dev, "unable to allocate 16 irqs: %d\n",
ucb->irq_base);
+ ret = ucb->irq_base;
goto err_irq_alloc;
}