3.2.67-rc1 review patch. If anyone has any objections, please let me know.
------------------ From: Johan Hovold <jo...@kernel.org> commit 5539b3c938d64a60cb1fc442ac3ce9263d52de0c upstream. 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: 391c970c0dd1 ("of/gpio: add default of_xlate function if device has a node pointer") Fixes: 664e3e5ac64c ("gpio / ACPI: register to ACPI events automatically") Signed-off-by: Johan Hovold <jo...@kernel.org> Signed-off-by: Linus Walleij <linus.wall...@linaro.org> [bwh: Backported to 3.2: - Move call to of_gpiochip_add() into conditional section rather than rearranging gotos and labels which are in different places here - There's no ACPI support] Signed-off-by: Ben Hutchings <b...@decadent.org.uk> --- drivers/gpio/gpiolib.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -1075,9 +1075,9 @@ int gpiochip_add(struct gpio_chip *chip) ? (1 << FLAG_IS_OUT) : 0; } - } - of_gpiochip_add(chip); + of_gpiochip_add(chip); + } unlock: spin_unlock_irqrestore(&gpio_lock, flags); @@ -1086,8 +1086,10 @@ unlock: goto fail; status = gpiochip_export(chip); - if (status) + if (status) { + of_gpiochip_remove(chip); goto fail; + } return 0; fail: -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/