1 files changed, 12 insertions, 6 deletions

diff --git a/drivers/mfd/wm8350-irq.c b/drivers/mfd/wm8350-irq.c
index ed4b22a167b3..8a1fafd0bf7d 100644
--- a/drivers/mfd/wm8350-irq.c
+++ b/drivers/mfd/wm8350-irq.c
@@ -473,17 +473,13 @@ int wm8350_irq_init(struct wm8350 *wm8350, int irq,
 {
         int ret, cur_irq, i;
         int flags = IRQF_ONESHOT;
+        int irq_base = -1;
 
         if (!irq) {
                 dev_warn(wm8350->dev, "No interrupt support, no core IRQ\n");
                 return 0;
         }
 
-        if (!pdata || !pdata->irq_base) {
-                dev_warn(wm8350->dev, "No interrupt support, no IRQ base\n");
-                return 0;
-        }
-
         /* Mask top level interrupts */
         wm8350_reg_write(wm8350, WM8350_SYSTEM_INTERRUPTS_MASK, 0xFFFF);
 
@@ -502,7 +498,17 @@ int wm8350_irq_init(struct wm8350 *wm8350, int irq,
         wm8350->chip_irq = irq;
         wm8350->irq_base = pdata->irq_base;
 
-        if (pdata->irq_high) {
+        if (pdata && pdata->irq_base > 0)
+                irq_base = pdata->irq_base;
+
+        wm8350->irq_base = irq_alloc_descs(irq_base, 0, ARRAY_SIZE(wm8350_irqs), 0);
+        if (wm8350->irq_base < 0) {
+                dev_warn(wm8350->dev, "Allocating irqs failed with %d\n",
+                        wm8350->irq_base);
+                return 0;
+        }
+
+        if (pdata && pdata->irq_high) {
                 flags |= IRQF_TRIGGER_HIGH;
 
                 wm8350_set_bits(wm8350, WM8350_SYSTEM_CONTROL_1,