Commit 2526dffc authored by Bartosz Golaszewski's avatar Bartosz Golaszewski
Browse files

gpio: remove GPIO device from the list unconditionally in error path 



Since commit 48e1b4d3 ("gpiolib: remove the GPIO device from the list
when it's unregistered") we remove the GPIO device entry from the global
list (used to order devices by their GPIO ranges) when unregistering the
chip, not when releasing the device. It will not happen when the last
reference is put anymore. This means, we need to remove it in error path
in gpiochip_add_data_with_key() unconditionally, without checking if the
device's .release() callback is set.

Fixes: 48e1b4d3 ("gpiolib: remove the GPIO device from the list when it's unregistered")
Signed-off-by: default avatarBartosz Golaszewski <bartosz.golaszewski@linaro.org>
parent 54be6c6c

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: