| From fb6bc4680028740801fffdb8103d7d02f14530d4 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 24 May 2021 11:52:42 -0700 |
| Subject: Input: hil_kbd - fix error return code in hil_dev_connect() |
| |
| From: Zhen Lei <thunder.leizhen@huawei.com> |
| |
| [ Upstream commit d9b576917a1d0efa293801a264150a1b37691617 ] |
| |
| Return error code -EINVAL rather than '0' when the combo devices are not |
| supported. |
| |
| Fixes: fa71c605c2bb ("Input: combine hil_kbd and hil_ptr drivers") |
| Reported-by: Hulk Robot <hulkci@huawei.com> |
| Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com> |
| Link: https://lore.kernel.org/r/20210515030053.6824-1-thunder.leizhen@huawei.com |
| Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/input/keyboard/hil_kbd.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| diff --git a/drivers/input/keyboard/hil_kbd.c b/drivers/input/keyboard/hil_kbd.c |
| index bb29a7c9a1c0..54afb38601b9 100644 |
| --- a/drivers/input/keyboard/hil_kbd.c |
| +++ b/drivers/input/keyboard/hil_kbd.c |
| @@ -512,6 +512,7 @@ static int hil_dev_connect(struct serio *serio, struct serio_driver *drv) |
| HIL_IDD_NUM_AXES_PER_SET(*idd)) { |
| printk(KERN_INFO PREFIX |
| "combo devices are not supported.\n"); |
| + error = -EINVAL; |
| goto bail1; |
| } |
| |
| -- |
| 2.30.2 |
| |
