From: Linus Walleij Date: Sun, 17 Feb 2019 20:59:33 +0000 (+0100) Subject: Merge tag 'gpio-v5.1-updates-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: v5.1-rc1~102^2~28 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8fab3d713ca36bf4ad4dadec0bf38f5e70b8999d;p=tomoyo%2Ftomoyo-test1.git Merge tag 'gpio-v5.1-updates-for-linus' of git://git./linux/kernel/git/brgl/linux into devel gpio updates for v5.1 - support for a new variant of pca953x - documentation fix from Wolfram - some tegra186 name changes - two minor fixes for madera and altera-a10sr --- 8fab3d713ca36bf4ad4dadec0bf38f5e70b8999d diff --cc drivers/gpio/gpio-pcf857x.c index 064c1d0a93e0,68a35b65925a..c9b650f617fa --- a/drivers/gpio/gpio-pcf857x.c +++ b/drivers/gpio/gpio-pcf857x.c @@@ -380,8 -390,9 +378,8 @@@ static int pcf857x_probe(struct i2c_cli if (status) goto fail; - gpiochip_set_nested_irqchip(&gpio->chip, &pcf857x_irq_chip, + gpiochip_set_nested_irqchip(&gpio->chip, &gpio->irqchip, client->irq); - gpio->irq_parent = client->irq; } /* Let platform code set up the GPIOs and their users.