Input: hil_kbd - Fix error return code in hil_dev_connect()

Started by Zhen Lei on May 15, 2021 · 2 messages from 2 authors · Last reply May 25, 2021

Subsystems (2)

Maintainers (2)

STALE1999d LANDED

Status: Landed in mainline as d9b576917a1d on 2021-05-25.

open the first message on its own page

Message details and related content
Return error code -EPERM rather than '0' when the combo devices are not
supported.

Fixes: fa71c605c2bb ("Input: combine hil_kbd and hil_ptr drivers")
Reported-by: Hulk Robot <redacted>
Signed-off-by: Zhen Lei <redacted>
---
 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 bb29a7c9a1c0cf5..ca38e8e20bb5484 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 = -EPERM;
 			goto bail1;
 		}
 
-- 
2.26.0.106.g9fadedd

Message details and related content
Hi Zhen,

On Sat, May 15, 2021 at 11:00:53AM +0800, Zhen Lei wrote:
Return error code -EPERM rather than '0' when the combo devices are not
I believe -EINVAL suits better here, so I used it and applied, thank
you.

Thanks.

-- 
Dmitry
Keyboard shortcuts
hback out one level
jnext message in thread / next series-diff position
kprevious message in thread / previous series-diff position
ldrill in
Escclose help / fold thread tree
?toggle this help