summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJia-Ju Bai <baijiaju1990@gmail.com>2021-03-04 05:19:57 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-04-28 13:16:52 +0200
commit21b2649ba286fb5eb97d0cb3149434ba7d6954ab (patch)
treea117d8a3e2738ae0928c0853e34ee78b9a7bea1b
parentf8991b03905f5c424be2fc7f98357ad5e4019cdd (diff)
downloadlinux-21b2649ba286fb5eb97d0cb3149434ba7d6954ab.tar.gz
linux-21b2649ba286fb5eb97d0cb3149434ba7d6954ab.tar.bz2
linux-21b2649ba286fb5eb97d0cb3149434ba7d6954ab.zip
HID: alps: fix error return code in alps_input_configured()
[ Upstream commit fa8ba6e5dc0e78e409e503ddcfceef5dd96527f4 ] When input_register_device() fails, no error return code is assigned. To fix this bug, ret is assigned with -ENOENT as error return code. Reported-by: TOTE Robot <oslab@tsinghua.edu.cn> Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/hid/hid-alps.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/hid-alps.c b/drivers/hid/hid-alps.c
index f4cf541d13e0..3eddd8f73b57 100644
--- a/drivers/hid/hid-alps.c
+++ b/drivers/hid/hid-alps.c
@@ -766,6 +766,7 @@ static int alps_input_configured(struct hid_device *hdev, struct hid_input *hi)
if (input_register_device(data->input2)) {
input_free_device(input2);
+ ret = -ENOENT;
goto exit;
}
}