Commit 62adc6f3 authored Feb 03, 2020 by Bartosz Golaszewski

gpiolib: fix gpio_do_set_config()

Commit d90f3685 ("gpiolib: have a single place of calling
set_config()") introduced a regression where we don't pass the right
variable as argument to the set_config() callback of gpio driver from
gpio_set_config(). After reverting two additional patches that came
on top of it - this addresses the issue by changing the type of the last
argument of gpio_do_set_config() to unsigned long and making sure the
packed config variable is actually used in gpio_set_config().

Fixes: d90f3685 ("gpiolib: have a single place of calling set_config()")
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Tested-by: Guenter Roeck <linux@roeck-us.net>

parent 91b4ea5f

drivers/gpio/gpiolib.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -3036,12 +3036,12 @@ EXPORT_SYMBOL_GPL(gpiochip_free_own_desc);
		*/

		static int gpio_do_set_config(struct gpio_chip *gc, unsigned int offset,
		enum pin_config_param mode)
		unsigned long config)
		{
		if (!gc->set_config)
		return -ENOTSUPP;

		return gc->set_config(gc, offset, mode);
		return gc->set_config(gc, offset, config);
		}

		static int gpio_set_config(struct gpio_chip *gc, unsigned int offset,
		@@ -3062,7 +3062,7 @@ static int gpio_set_config(struct gpio_chip *gc, unsigned int offset,
		}

		config = PIN_CONF_PACKED(mode, arg);
		return gpio_do_set_config(gc, offset, mode);
		return gpio_do_set_config(gc, offset, config);
		}

		static int gpio_set_bias(struct gpio_chip chip, struct gpio_desc desc)

Admin message