summaryrefslogtreecommitdiff
path: root/drivers/hid
diff options
context:
space:
mode:
authorZhen Lei <thunder.leizhen@huawei.com>2021-05-08 10:47:37 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-06-10 13:37:04 +0200
commit279e2136dd217b961d6f22205fbb4eb3f7e6d975 (patch)
tree9b6a2758bad2f84bb41af9a4fbbe69e636d582cb /drivers/hid
parentc8a95cb0c02d15f48062867c5575bce99ecc2853 (diff)
downloadlinux-279e2136dd217b961d6f22205fbb4eb3f7e6d975.tar.gz
linux-279e2136dd217b961d6f22205fbb4eb3f7e6d975.tar.bz2
linux-279e2136dd217b961d6f22205fbb4eb3f7e6d975.zip
HID: pidff: fix error return code in hid_pidff_init()
[ Upstream commit 3dd653c077efda8152f4dd395359617d577a54cd ] Fix to return a negative error code from the error handling case instead of 0, as done elsewhere in this function. Fixes: 224ee88fe395 ("Input: add force feedback driver for PID devices") Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/usbhid/hid-pidff.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/usbhid/hid-pidff.c b/drivers/hid/usbhid/hid-pidff.c
index fddac7c72f64..07a9fe97d2e0 100644
--- a/drivers/hid/usbhid/hid-pidff.c
+++ b/drivers/hid/usbhid/hid-pidff.c
@@ -1292,6 +1292,7 @@ int hid_pidff_init(struct hid_device *hid)
if (pidff->pool[PID_DEVICE_MANAGED_POOL].value &&
pidff->pool[PID_DEVICE_MANAGED_POOL].value[0] == 0) {
+ error = -EPERM;
hid_notice(hid,
"device does not support device managed pool\n");
goto fail;