Skip to content

Commit 4a8e4b3

Browse files
committed
Merge tag 'gpio-fixes-for-v6.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux
Pull gpio fix from Bartosz Golaszewski: - remove the new GPIO device from the global list unconditionally in error path in core GPIOLIB * tag 'gpio-fixes-for-v6.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux: gpio: remove GPIO device from the list unconditionally in error path
2 parents c76b766 + 2526dff commit 4a8e4b3

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

drivers/gpio/gpiolib.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1005,15 +1005,15 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data,
10051005
err_free_gpiochip_mask:
10061006
gpiochip_remove_pin_ranges(gc);
10071007
gpiochip_free_valid_mask(gc);
1008+
err_remove_from_list:
1009+
spin_lock_irqsave(&gpio_lock, flags);
1010+
list_del(&gdev->list);
1011+
spin_unlock_irqrestore(&gpio_lock, flags);
10081012
if (gdev->dev.release) {
10091013
/* release() has been registered by gpiochip_setup_dev() */
10101014
gpio_device_put(gdev);
10111015
goto err_print_message;
10121016
}
1013-
err_remove_from_list:
1014-
spin_lock_irqsave(&gpio_lock, flags);
1015-
list_del(&gdev->list);
1016-
spin_unlock_irqrestore(&gpio_lock, flags);
10171017
err_free_label:
10181018
kfree_const(gdev->label);
10191019
err_free_descs:

0 commit comments

Comments
 (0)