diff options
| author |   Dan Carpenter <dan.carpenter@oracle.com> | 2022-06-23 11:29:48 +0300 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-06-29 08:58:47 +0200 |
| commit | 4837d1c81223fc89dd005e4136da670fa43744c3 (patch) | |
| tree | 043adac775f94372b743ed551101cd6bf96686a5 | |
| parent | Revert "net/tls: fix tls_sk_proto_close executed repeatedly" (diff) | |
| download | wireguard-linux-4837d1c81223fc89dd005e4136da670fa43744c3.tar.xz wireguard-linux-4837d1c81223fc89dd005e4136da670fa43744c3.zip | |
gpio: winbond: Fix error code in winbond_gpio_get()
[ Upstream commit 9ca766eaea2e87b8b773bff04ee56c055cb76d4e ]
This error path returns 1, but it should instead propagate the negative
error code from winbond_sio_enter().
Fixes: a0d65009411c ("gpio: winbond: Add driver")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/gpio/gpio-winbond.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpio/gpio-winbond.c b/drivers/gpio/gpio-winbond.c index 7f8f5b02e31d..4b61d975cc0e 100644 --- a/drivers/gpio/gpio-winbond.c +++ b/drivers/gpio/gpio-winbond.c @@ -385,12 +385,13 @@ static int winbond_gpio_get(struct gpio_chip *gc, unsigned int offset) unsigned long *base = gpiochip_get_data(gc); const struct winbond_gpio_info *info; bool val; + int ret; winbond_gpio_get_info(&offset, &info); - val = winbond_sio_enter(*base); - if (val) - return val; + ret = winbond_sio_enter(*base); + if (ret) + return ret; winbond_sio_select_logical(*base, info->dev); |