Merge branch 'stable-3.14' of git://git.infradead.org/users/pcmoore/selinux into...

[linux-2.6-microblaze.git] / drivers / mfd / ucb1x00-core.c

diff --git a/drivers/mfd/ucb1x00-core.c b/drivers/mfd/ucb1x00-core.c
index d5966e6..0313f83 100644 (file)
--- 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;
        }