diff options
| author | Bartosz Golaszewski <bgolaszewski@baylibre.com> | 2020-02-03 14:03:47 +0100 |
|---|---|---|
| committer | Bartosz Golaszewski <bgolaszewski@baylibre.com> | 2020-02-10 10:55:18 +0100 |
| commit | 91b4ea5fc57c6a0a1beea7056dc2f83e2ec6968c (patch) | |
| tree | 47b4e12ead83477aaace376fc72b47699e56d14c /drivers/gpio | |
| parent | Revert "gpiolib: Remove duplicated function gpio_do_set_config()" (diff) | |
| download | linux-91b4ea5fc57c6a0a1beea7056dc2f83e2ec6968c.tar.xz linux-91b4ea5fc57c6a0a1beea7056dc2f83e2ec6968c.zip | |
Revert "gpiolib: remove set but not used variable 'config'"
This reverts commit e5e42ad224a040f93bf112e96f82b3a0ed97ffab.
This patch came on top of another patch that introduced a regression.
Revert it before addressing the culprit.
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Tested-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/gpio')
| -rw-r--r-- | drivers/gpio/gpiolib.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index a3e4f5f5871f..c317567eeaa0 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -3047,6 +3047,7 @@ static int gpio_do_set_config(struct gpio_chip *gc, unsigned int offset, static int gpio_set_config(struct gpio_chip *gc, unsigned int offset, enum pin_config_param mode) { + unsigned long config; unsigned arg; switch (mode) { @@ -3060,6 +3061,7 @@ static int gpio_set_config(struct gpio_chip *gc, unsigned int offset, arg = 0; } + config = PIN_CONF_PACKED(mode, arg); return gpio_do_set_config(gc, offset, mode); } |