Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7da85fbf authored by Sébastien Szymanski's avatar Sébastien Szymanski Committed by Jiri Kosina
Browse files

HID: cp2112: fix broken gpio_direction_input callback 



When everything goes smoothly, ret is set to 0 which makes the function
to return EIO error.

Fixes: 8e9faa15 ("HID: cp2112: fix gpio-callback error handling")
Signed-off-by: default avatarSébastien Szymanski <sebastien.szymanski@armadeus.com>
Reviewed-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent ce4dd820

drivers/hid/hid-cp2112.c

+6 −2
Original line number Diff line number Diff line
@@ -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)