]> Git Repo - linux.git/commitdiff
Merge tag 'gpio-v5.3-rc1-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kerne...
authorLinus Walleij <[email protected]>
Tue, 16 Jul 2019 09:12:14 +0000 (11:12 +0200)
committerLinus Walleij <[email protected]>
Tue, 16 Jul 2019 09:12:14 +0000 (11:12 +0200)
GPIO fixes for v5.3-rc1

- silence error messages on probe deferral in gpio-davinci
- fix a memory leak in gpiolib-of
- fix a potential use-after-free error in gpio-em

1  2 
drivers/gpio/gpiolib-of.c

index a8f02f551d6b4bf93a09a567aa5d6bf69b02e74c,81ed50da3e9e1c0d51cde304013b54fbd942c13a..567fb98c0892740a8921a18542514fdb84b57fc0
@@@ -118,8 -118,15 +118,8 @@@ static void of_gpio_flags_quirks(struc
         * Legacy handling of SPI active high chip select. If we have a
         * property named "cs-gpios" we need to inspect the child node
         * to determine if the flags should have inverted semantics.
 -       *
 -       * This does not apply to an SPI device named "spi-gpio", because
 -       * these have traditionally obtained their own GPIOs by parsing
 -       * the device tree directly and did not respect any "spi-cs-high"
 -       * property on the SPI bus children.
         */
 -      if (IS_ENABLED(CONFIG_SPI_MASTER) &&
 -          !strcmp(propname, "cs-gpios") &&
 -          !of_device_is_compatible(np, "spi-gpio") &&
 +      if (IS_ENABLED(CONFIG_SPI_MASTER) && !strcmp(propname, "cs-gpios") &&
            of_property_read_bool(np, "cs-gpios")) {
                struct device_node *child;
                u32 cs;
                                                        of_node_full_name(child));
                                        *flags |= OF_GPIO_ACTIVE_LOW;
                                }
+                               of_node_put(child);
                                break;
                        }
                }
This page took 0.058976 seconds and 4 git commands to generate.