gpio: fix memory and reference leaks in gpiochip_add error path
Memory allocated and references taken by of_gpiochip_add and acpi_gpiochip_add were never released on errors in gpiochip_add (e.g. failure to find free gpio range). Fixes:391c970c0d
("of/gpio: add default of_xlate function if device has a node pointer") Fixes:664e3e5ac6
("gpio / ACPI: register to ACPI events automatically") Cc: stable <stable@vger.kernel.org> Signed-off-by: Johan Hovold <johan@kernel.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
parent
e733a2fb8c
commit
5539b3c938
|
@ -277,6 +277,9 @@ int gpiochip_add(struct gpio_chip *chip)
|
|||
|
||||
spin_unlock_irqrestore(&gpio_lock, flags);
|
||||
|
||||
if (status)
|
||||
goto fail;
|
||||
|
||||
#ifdef CONFIG_PINCTRL
|
||||
INIT_LIST_HEAD(&chip->pin_ranges);
|
||||
#endif
|
||||
|
@ -284,12 +287,12 @@ int gpiochip_add(struct gpio_chip *chip)
|
|||
of_gpiochip_add(chip);
|
||||
acpi_gpiochip_add(chip);
|
||||
|
||||
if (status)
|
||||
goto fail;
|
||||
|
||||
status = gpiochip_export(chip);
|
||||
if (status)
|
||||
if (status) {
|
||||
acpi_gpiochip_remove(chip);
|
||||
of_gpiochip_remove(chip);
|
||||
goto fail;
|
||||
}
|
||||
|
||||
pr_debug("%s: registered GPIOs %d to %d on device: %s\n", __func__,
|
||||
chip->base, chip->base + chip->ngpio - 1,
|
||||
|
|
Loading…
Reference in a new issue