diff options
| author | Mark Brown <broonie@kernel.org> | 2017-08-21 21:32:58 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-08-21 21:32:58 +0300 |
| commit | 6329b1bb4e691b24e51ea940b3c2cffd402bd5f8 (patch) | |
| tree | 1e01171ec074d83637f3249a64c179b2147e8e4b /drivers/gpio/gpio-mxc.c | |
| parent | 702992387b759828f58e52f660acb284b3069944 (diff) | |
| parent | 14ccee78fc82f5512908f4424f541549a5705b89 (diff) | |
| download | linux-6329b1bb4e691b24e51ea940b3c2cffd402bd5f8.tar.xz | |
Merge tag 'v4.13-rc6' into asoc-msm8916
Linux 4.13-rc6
Diffstat (limited to 'drivers/gpio/gpio-mxc.c')
| -rw-r--r-- | drivers/gpio/gpio-mxc.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpio/gpio-mxc.c b/drivers/gpio/gpio-mxc.c index 3abea3f0b307..92692251ade1 100644 --- a/drivers/gpio/gpio-mxc.c +++ b/drivers/gpio/gpio-mxc.c @@ -424,6 +424,9 @@ static int mxc_gpio_probe(struct platform_device *pdev) return PTR_ERR(port->base); port->irq_high = platform_get_irq(pdev, 1); + if (port->irq_high < 0) + port->irq_high = 0; + port->irq = platform_get_irq(pdev, 0); if (port->irq < 0) return port->irq; |