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

Commit 7cf1a122 authored by Markus Pargmann's avatar Markus Pargmann Committed by Greg Kroah-Hartman
Browse files

w1-gpio: Detect of_gpio_error for first gpio 



The first DT gpio is necessary for this driver, but errors returned for
of_get_gpio are ignored.

This patch adds a return value check for the first of_get_gpio.

Signed-off-by: default avatarMarkus Pargmann <mpa@pengutronix.de>
Acked-by: default avatarEvgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e6418fcc

drivers/w1/masters/w1-gpio.c

+6 −1
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ static int w1_gpio_probe_dt(struct platform_device *pdev) 
{

	struct w1_gpio_platform_data *pdata = pdev->dev.platform_data;

	struct device_node *np = pdev->dev.of_node;

	int gpio;



	pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);

	if (!pdata)
@@ -66,7 +67,11 @@ static int w1_gpio_probe_dt(struct platform_device *pdev) 
	if (of_get_property(np, "linux,open-drain", NULL))

		pdata->is_open_drain = 1;



	pdata->pin = of_get_gpio(np, 0);

	gpio = of_get_gpio(np, 0);

	if (gpio < 0)

		return gpio;

	pdata->pin = gpio;



	pdata->ext_pullup_enable_pin = of_get_gpio(np, 1);

	pdev->dev.platform_data = pdata;