diff options
| author | Felipe Balbi <balbi@ti.com> | 2015-01-19 16:57:20 +0100 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2015-01-19 16:57:20 +0100 |
| commit | d1fc4440d761af47fd0c32661725011bf66ebb51 (patch) | |
| tree | d2fdfe049eac9b45a9418bd1be103297b1c0c55e /drivers/gpio/gpio-grgpio.c | |
| parent | usb: musb: debugfs: improve copy_from_user() argument (diff) | |
| parent | Linux 3.19-rc5 (diff) | |
| download | linux-d1fc4440d761af47fd0c32661725011bf66ebb51.tar.xz linux-d1fc4440d761af47fd0c32661725011bf66ebb51.zip | |
Merge tag 'v3.19-rc5' into next
Linux 3.19-rc5
Conflicts:
drivers/usb/dwc2/gadget.c
drivers/usb/gadget/udc/bdc/bdc_ep.c
Diffstat (limited to 'drivers/gpio/gpio-grgpio.c')
| -rw-r--r-- | drivers/gpio/gpio-grgpio.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpio/gpio-grgpio.c b/drivers/gpio/gpio-grgpio.c index 09daaf2aeb56..3a5a71050559 100644 --- a/drivers/gpio/gpio-grgpio.c +++ b/drivers/gpio/gpio-grgpio.c @@ -441,7 +441,8 @@ 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); + if (priv->domain) + irq_domain_remove(priv->domain); return err; } |