* [PATCH v2 3/3] HID: cp2112: fix broken gpio_direction_input callback
@ 2017-11-10 9:01 Sébastien Szymanski
2017-11-10 10:18 ` Benjamin Tissoires
2017-11-10 12:33 ` Jiri Kosina
0 siblings, 2 replies; 3+ messages in thread
From: Sébastien Szymanski @ 2017-11-10 9:01 UTC (permalink / raw)
To: linux-input
Cc: linux-kernel, Benjamin Tissoires, Jiri Kosina, Julien Boibessot,
Sébastien Szymanski
When everything goes smoothly, ret is set to 0 which makes the function
to return EIO error.
Fixes: 8e9faa15469e ("HID: cp2112: fix gpio-callback error handling")
Signed-off-by: Sébastien Szymanski <sebastien.szymanski@armadeus.com>
---
Changes in v2:
- rework error handling to have only one exit path as suggested by
Benjamin Tissoires <benjamin.tissoires@redhat.com>
drivers/hid/hid-cp2112.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/hid/hid-cp2112.c b/drivers/hid/hid-cp2112.c
index 28e3c18..68cdc96 100644
--- a/drivers/hid/hid-cp2112.c
+++ b/drivers/hid/hid-cp2112.c
@@ -196,6 +196,8 @@ static int cp2112_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
HID_REQ_GET_REPORT);
if (ret != CP2112_GPIO_CONFIG_LENGTH) {
hid_err(hdev, "error requesting GPIO config: %d\n", ret);
+ if (ret >= 0)
+ ret = -EIO;
goto exit;
}
@@ -205,8 +207,10 @@ static int cp2112_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
ret = hid_hw_raw_request(hdev, CP2112_GPIO_CONFIG, buf,
CP2112_GPIO_CONFIG_LENGTH, HID_FEATURE_REPORT,
HID_REQ_SET_REPORT);
- if (ret < 0) {
+ if (ret != CP2112_GPIO_CONFIG_LENGTH) {
hid_err(hdev, "error setting GPIO config: %d\n", ret);
+ if (ret >= 0)
+ ret = -EIO;
goto exit;
}
@@ -214,7 +218,7 @@ static int cp2112_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
exit:
mutex_unlock(&dev->lock);
- return ret < 0 ? ret : -EIO;
+ return ret;
}
static void cp2112_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
--
2.7.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2 3/3] HID: cp2112: fix broken gpio_direction_input callback
2017-11-10 9:01 [PATCH v2 3/3] HID: cp2112: fix broken gpio_direction_input callback Sébastien Szymanski
@ 2017-11-10 10:18 ` Benjamin Tissoires
2017-11-10 12:33 ` Jiri Kosina
1 sibling, 0 replies; 3+ messages in thread
From: Benjamin Tissoires @ 2017-11-10 10:18 UTC (permalink / raw)
To: Sébastien Szymanski
Cc: linux-input, linux-kernel, Jiri Kosina, Julien Boibessot
On Nov 10 2017 or thereabouts, Sébastien Szymanski wrote:
> When everything goes smoothly, ret is set to 0 which makes the function
> to return EIO error.
>
> Fixes: 8e9faa15469e ("HID: cp2112: fix gpio-callback error handling")
> Signed-off-by: Sébastien Szymanski <sebastien.szymanski@armadeus.com>
> ---
> Changes in v2:
> - rework error handling to have only one exit path as suggested by
> Benjamin Tissoires <benjamin.tissoires@redhat.com>
Looks good to me now. Thanks for the respin:
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Cheers,
Benjamin
>
> drivers/hid/hid-cp2112.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/hid/hid-cp2112.c b/drivers/hid/hid-cp2112.c
> index 28e3c18..68cdc96 100644
> --- a/drivers/hid/hid-cp2112.c
> +++ b/drivers/hid/hid-cp2112.c
> @@ -196,6 +196,8 @@ static int cp2112_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
> HID_REQ_GET_REPORT);
> if (ret != CP2112_GPIO_CONFIG_LENGTH) {
> hid_err(hdev, "error requesting GPIO config: %d\n", ret);
> + if (ret >= 0)
> + ret = -EIO;
> goto exit;
> }
>
> @@ -205,8 +207,10 @@ static int cp2112_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
> ret = hid_hw_raw_request(hdev, CP2112_GPIO_CONFIG, buf,
> CP2112_GPIO_CONFIG_LENGTH, HID_FEATURE_REPORT,
> HID_REQ_SET_REPORT);
> - if (ret < 0) {
> + if (ret != CP2112_GPIO_CONFIG_LENGTH) {
> hid_err(hdev, "error setting GPIO config: %d\n", ret);
> + if (ret >= 0)
> + ret = -EIO;
> goto exit;
> }
>
> @@ -214,7 +218,7 @@ static int cp2112_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
>
> exit:
> mutex_unlock(&dev->lock);
> - return ret < 0 ? ret : -EIO;
> + return ret;
> }
>
> static void cp2112_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
> --
> 2.7.3
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2 3/3] HID: cp2112: fix broken gpio_direction_input callback
2017-11-10 9:01 [PATCH v2 3/3] HID: cp2112: fix broken gpio_direction_input callback Sébastien Szymanski
2017-11-10 10:18 ` Benjamin Tissoires
@ 2017-11-10 12:33 ` Jiri Kosina
1 sibling, 0 replies; 3+ messages in thread
From: Jiri Kosina @ 2017-11-10 12:33 UTC (permalink / raw)
To: Sébastien Szymanski
Cc: linux-input, linux-kernel, Benjamin Tissoires, Julien Boibessot
On Fri, 10 Nov 2017, Sébastien Szymanski wrote:
> When everything goes smoothly, ret is set to 0 which makes the function
> to return EIO error.
>
> Fixes: 8e9faa15469e ("HID: cp2112: fix gpio-callback error handling")
> Signed-off-by: Sébastien Szymanski <sebastien.szymanski@armadeus.com>
> ---
> Changes in v2:
> - rework error handling to have only one exit path as suggested by
> Benjamin Tissoires <benjamin.tissoires@redhat.com>
Applied to for-4.15/upstream.
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-11-10 12:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-10 9:01 [PATCH v2 3/3] HID: cp2112: fix broken gpio_direction_input callback Sébastien Szymanski
2017-11-10 10:18 ` Benjamin Tissoires
2017-11-10 12:33 ` Jiri Kosina
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).