Commit 81a271c1 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by sanglipeng1
Browse files

gpio: fix resource unwinding order in error path 

stable inclusion
from stable-v5.10.212
commit 1805131d8f939fb1fefa5394b62af71523281990
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAGOP2

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=1805131d8f939fb1fefa5394b62af71523281990



--------------------------------

[ Upstream commit ec5c54a9d3c4f9c15e647b049fea401ee5258696 ]

Hogs are added *after* ACPI so should be removed *before* in error path.

Fixes: a411e81e ("gpiolib: add hogs support for machine code")
Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarsanglipeng1 <sanglipeng1@jd.com>
parent d66cff1d

drivers/gpio/gpiolib.c

+4 −4
Original line number Diff line number Diff line
@@ -732,11 +732,11 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, 


	ret = gpiochip_irqchip_init_valid_mask(gc);

	if (ret)

		goto err_remove_acpi_chip;

		goto err_free_hogs;



	ret = gpiochip_irqchip_init_hw(gc);

	if (ret)

		goto err_remove_acpi_chip;

		goto err_remove_irqchip_mask;



	ret = gpiochip_add_irqchip(gc, lock_key, request_key);

	if (ret)
@@ -761,11 +761,11 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, 
	gpiochip_irqchip_remove(gc);

err_remove_irqchip_mask:

	gpiochip_irqchip_free_valid_mask(gc);

err_remove_acpi_chip:

err_free_hogs:

	gpiochip_free_hogs(gc);

	acpi_gpiochip_remove(gc);

	gpiochip_remove_pin_ranges(gc);

err_remove_of_chip:

	gpiochip_free_hogs(gc);

	of_gpiochip_remove(gc);

err_free_gpiochip_mask:

	gpiochip_free_valid_mask(gc);