Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / drivers / gpio / gpio-grgpio.c

diff --git a/drivers/gpio/gpio-grgpio.c b/drivers/gpio/gpio-grgpio.c
index 66ad3df9d9cfdbbb3acab6af63df4a6101d8671a..09daaf2aeb563d982c71807b8155df4b2c50a6c5 100644 (file)
--- a/drivers/gpio/gpio-grgpio.c
+++ b/drivers/gpio/gpio-grgpio.c
@@ -441,6 +441,7 @@ static int grgpio_probe(struct platform_device *ofdev)
        err = gpiochip_add(gc);
        if (err) {
                dev_err(&ofdev->dev, "Could not add gpiochip\n");
+               irq_domain_remove(priv->domain);
                return err;
        }
 
@@ -490,7 +491,6 @@ MODULE_DEVICE_TABLE(of, grgpio_match);
 static struct platform_driver grgpio_driver = {
        .driver = {
                .name = "grgpio",
-               .owner = THIS_MODULE,
                .of_match_table = grgpio_match,
        },
        .probe = grgpio_probe,