Commit 3149860d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gpio-fixes-for-v5.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux 

Pull gpio fixes from Bartosz Golaszewski:
 "Two fixes for the GPIO subsystem. Both address issues in the core GPIO
  code:

   - fix the return value in error path in gpiolib_dev_init()

   - fix the 'gpio-line-names' property handling correctly this time"

* tag 'gpio-fixes-for-v5.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux:
  gpiolib: Assign fwnode to parent's if no primary one provided
  gpiolib: Fix error return code in gpiolib_dev_init()
parents 6bfea141 6cb59afe

drivers/gpio/gpiolib.c

+9 −1
Original line number Diff line number Diff line
@@ -571,6 +571,7 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, 
			       struct lock_class_key *lock_key,

			       struct lock_class_key *request_key)

{

	struct fwnode_handle *fwnode = gc->parent ? dev_fwnode(gc->parent) : NULL;

	unsigned long	flags;

	int		ret = 0;

	unsigned	i;
@@ -594,6 +595,12 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, 


	of_gpio_dev_init(gc, gdev);



	/*

	 * Assign fwnode depending on the result of the previous calls,

	 * if none of them succeed, assign it to the parent's one.

	 */

	gdev->dev.fwnode = dev_fwnode(&gdev->dev) ?: fwnode;



	gdev->id = ida_alloc(&gpio_ida, GFP_KERNEL);

	if (gdev->id < 0) {

		ret = gdev->id;
@@ -4256,7 +4263,8 @@ static int __init gpiolib_dev_init(void) 
		return ret;

	}



	if (driver_register(&gpio_stub_drv) < 0) {

	ret = driver_register(&gpio_stub_drv);

	if (ret < 0) {

		pr_err("gpiolib: could not register GPIO stub driver\n");

		bus_unregister(&gpio_bus_type);

		return ret;