Commit 4a8e4b3c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents c76b766e 2526dffc

drivers/gpio/gpiolib.c

+4 −4
Original line number Diff line number Diff line
@@ -1005,15 +1005,15 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, 
err_free_gpiochip_mask:

	gpiochip_remove_pin_ranges(gc);

	gpiochip_free_valid_mask(gc);

err_remove_from_list:

	spin_lock_irqsave(&gpio_lock, flags);

	list_del(&gdev->list);

	spin_unlock_irqrestore(&gpio_lock, flags);

	if (gdev->dev.release) {

		/* release() has been registered by gpiochip_setup_dev() */

		gpio_device_put(gdev);

		goto err_print_message;

	}

err_remove_from_list:

	spin_lock_irqsave(&gpio_lock, flags);

	list_del(&gdev->list);

	spin_unlock_irqrestore(&gpio_lock, flags);

err_free_label:

	kfree_const(gdev->label);

err_free_descs: