From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752328AbdKJKSd (ORCPT ); Fri, 10 Nov 2017 05:18:33 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42132 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751063AbdKJKSc (ORCPT ); Fri, 10 Nov 2017 05:18:32 -0500 Date: Fri, 10 Nov 2017 11:18:26 +0100 From: Benjamin Tissoires To: =?utf-8?Q?S=C3=A9bastien?= Szymanski Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Jiri Kosina , Julien Boibessot Subject: Re: [PATCH v2 3/3] HID: cp2112: fix broken gpio_direction_input callback Message-ID: <20171110101826.GS9728@mail.corp.redhat.com> References: <1510304503-30830-1-git-send-email-sebastien.szymanski@armadeus.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1510304503-30830-1-git-send-email-sebastien.szymanski@armadeus.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Fri, 10 Nov 2017 10:18:32 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > --- > Changes in v2: > - rework error handling to have only one exit path as suggested by > Benjamin Tissoires Looks good to me now. Thanks for the respin: Reviewed-by: Benjamin Tissoires 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 >