Commit d66cff1d authored by Andy Shevchenko's avatar Andy Shevchenko Committed by sanglipeng1
Browse files

gpiolib: Fix the error path order in gpiochip_add_data_with_key() 

stable inclusion
from stable-v5.10.212
commit 51f7044d103b35287c1396e786213003be027731
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=51f7044d103b35287c1396e786213003be027731



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

[ Upstream commit e4aec4daa8c009057b5e063db1b7322252c92dc8 ]

After shuffling the code, error path wasn't updated correctly.
Fix it here.

Fixes: 2f4133bb ("gpiolib: No need to call gpiochip_remove_pin_ranges() twice")
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarsanglipeng1 <sanglipeng1@jd.com>
parent 73412b7f

drivers/gpio/gpiolib.c

+1 −1
Original line number Diff line number Diff line
@@ -763,11 +763,11 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, 
	gpiochip_irqchip_free_valid_mask(gc);

err_remove_acpi_chip:

	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_remove_pin_ranges(gc);

	gpiochip_free_valid_mask(gc);

err_remove_from_list:

	spin_lock_irqsave(&gpio_lock, flags);