Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d18f0a1 authored by Linus Walleij's avatar Linus Walleij
Browse files

gpio: No NULL owner 



Sometimes a GPIO is fetched with NULL as parent device, and
that is just fine. So under these circumstances, avoid using
dev_name() to provide a name for the GPIO line.

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent b888fb6f

drivers/gpio/gpiolib.c

+7 −2
Original line number Original line Diff line number Diff line
@@ -3623,6 +3623,8 @@ struct gpio_desc *__must_check gpiod_get_index(struct device *dev, 
	struct gpio_desc *desc = NULL;

	struct gpio_desc *desc = NULL;

	int status;

	int status;

	enum gpio_lookup_flags lookupflags = 0;

	enum gpio_lookup_flags lookupflags = 0;

	/* Maybe we have a device name, maybe not */

	const char *devname = dev ? dev_name(dev) : "?";





	dev_dbg(dev, "GPIO lookup for consumer %s\n", con_id);

	dev_dbg(dev, "GPIO lookup for consumer %s\n", con_id);
@@ -3651,8 +3653,11 @@ struct gpio_desc *__must_check gpiod_get_index(struct device *dev, 
		return desc;

		return desc;

	}

	}





	/* If a connection label was passed use that, else use the device name as label */

	/*

	status = gpiod_request(desc, con_id ? con_id : dev_name(dev));

	 * If a connection label was passed use that, else attempt to use

	 * the device name as label

	 */

	status = gpiod_request(desc, con_id ? con_id : devname);

	if (status < 0)

	if (status < 0)

		return ERR_PTR(status);

		return ERR_PTR(status);