diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-08-10 13:14:15 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-08-10 13:14:15 +0200 |
| commit | 1d0f49e14007a5426eb7e9e5808168cdb77b3e7f (patch) | |
| tree | 1d7eb036e06938dedb7488910e4d34dc4c73fa68 /drivers/gpio/gpio-mxc.c | |
| parent | 99504819fc643160afd6813921b1d42b18e52a49 (diff) | |
| parent | e93c17301ac55321fc18e0f8316e924e58a83c8c (diff) | |
| download | linux-1d0f49e14007a5426eb7e9e5808168cdb77b3e7f.tar.gz linux-1d0f49e14007a5426eb7e9e5808168cdb77b3e7f.tar.bz2 linux-1d0f49e14007a5426eb7e9e5808168cdb77b3e7f.zip | |
Merge branch 'x86/urgent' into x86/asm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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; |