OSDN Git Service

HID: alps: Fix an error handling path in 'alps_input_configured()'
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Wed, 4 Dec 2019 03:35:25 +0000 (04:35 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 5 Mar 2020 15:42:19 +0000 (16:42 +0100)
commitbcfa3be32de5a44ca094a5d41d449b2e3178792b
tree8bedb9de5d71eaba82addb02b7bfe002ed6ff906
parentad598a48fe61c6c2407f08a807cb7a2ea83386b3
HID: alps: Fix an error handling path in 'alps_input_configured()'

commit 8d2e77b39b8fecb794e19cd006a12f90b14dd077 upstream.

They are issues:
   - if 'input_allocate_device()' fails and return NULL, there is no need
     to free anything and 'input_free_device()' call is a no-op. It can
     be axed.
   - 'ret' is known to be 0 at this point, so we must set it to a
     meaningful value before returning

Fixes: 2562756dde55 ("HID: add Alps I2C HID Touchpad-Stick support")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/hid/hid-alps.c