| Message ID | 20210508024737.1927-1-thunder.leizhen@huawei.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 3dd653c077efda8152f4dd395359617d577a54cd |
| Delegated to: | Jiri Kosina |
| Headers | show |
| Series | [1/1] HID: pidff: fix error return code in hid_pidff_init() | expand |
On Sat, 8 May 2021, Zhen Lei wrote: > 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> > --- > drivers/hid/usbhid/hid-pidff.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/hid/usbhid/hid-pidff.c b/drivers/hid/usbhid/hid-pidff.c > index ea126c50acc3..3b4ee21cd811 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; Good catch, applied, thank you.
diff --git a/drivers/hid/usbhid/hid-pidff.c b/drivers/hid/usbhid/hid-pidff.c index ea126c50acc3..3b4ee21cd811 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;
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> --- drivers/hid/usbhid/hid-pidff.c | 1 + 1 file changed, 1 insertion(+)