From: Jonas Gorski Date: Tue, 14 May 2019 11:13:53 +0000 (+0200) Subject: brcm63xx: fixup broken patch after kernel bump X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3611cfe73d5f9680d387ef14632431fac30bbd9b;p=openwrt%2Fstaging%2Fjow.git brcm63xx: fixup broken patch after kernel bump Fixes the following compilation issue that was introduced with the bump to 4.14.118: CC drivers/gpio/gpiolib-of.o drivers/gpio/gpiolib-of.c: In function 'of_gpiochip_add': drivers/gpio/gpiolib-of.c:510:12: error: too few arguments to function 'of_gpiochip_scan_gpios' status = of_gpiochip_scan_gpios(chip); ^~~~~~~~~~~~~~~~~~~~~~ drivers/gpio/gpiolib-of.c:247:5: note: declared here int of_gpiochip_scan_gpios(struct gpio_chip *chip, unsigned int start, ^~~~~~~~~~~~~~~~~~~~~~ scripts/Makefile.build:326: recipe for target 'drivers/gpio/gpiolib-of.o' failed Fixes: 09050b6fe228 ("kernel: bump 4.14 to 4.14.118") Signed-off-by: Jonas Gorski --- diff --git a/target/linux/brcm63xx/patches-4.14/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch b/target/linux/brcm63xx/patches-4.14/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch index 61e1b282c7..a42c894549 100644 --- a/target/linux/brcm63xx/patches-4.14/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch +++ b/target/linux/brcm63xx/patches-4.14/143-gpio-fix-device-tree-gpio-hogs-on-dual-role-gpio-pin.patch @@ -77,7 +77,7 @@ Signed-off-by: Jonas Gorski - of_node_put(chip->of_node); - gpiochip_remove_pin_ranges(chip); + if (!chip->request) { -+ status = of_gpiochip_scan_gpios(chip); ++ status = of_gpiochip_scan_gpios(chip, 0, chip->ngpio); + if (status) { + of_node_put(chip->of_node); + gpiochip_remove_pin_ranges(chip);