pinctrl: baytrail: Register GPIO chip after chip->to_irq is set

[mirror_ubuntu-artful-kernel.git] / drivers / pinctrl / pinctrl-baytrail.c

diff --git a/drivers/pinctrl/pinctrl-baytrail.c b/drivers/pinctrl/pinctrl-baytrail.c
index 447f1dc25ea6c682baefc3a43eea5bf87231ac20..7c65c9dab215cf59923e38f3c862e6a6d4e24a8f 100644 (file)
--- a/drivers/pinctrl/pinctrl-baytrail.c
+++ b/drivers/pinctrl/pinctrl-baytrail.c
@@ -527,12 +527,6 @@ static int byt_gpio_probe(struct platform_device *pdev)
        gc->can_sleep = false;
        gc->dev = dev;
 
-       ret = gpiochip_add(gc);
-       if (ret) {
-               dev_err(&pdev->dev, "failed adding byt-gpio chip\n");
-               return ret;
-       }
-
        /* set up interrupts  */
        irq_rc = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
        if (irq_rc && irq_rc->start) {
@@ -550,6 +544,12 @@ static int byt_gpio_probe(struct platform_device *pdev)
                irq_set_chained_handler(hwirq, byt_gpio_irq_handler);
        }
 
+       ret = gpiochip_add(gc);
+       if (ret) {
+               dev_err(&pdev->dev, "failed adding byt-gpio chip\n");
+               return ret;
+       }
+
        pm_runtime_enable(dev);
 
        return 0;