Commit bcfa3be3 authored Dec 04, 2019 by Christophe JAILLET Committed by Greg Kroah-Hartman Mar 05, 2020

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: 2562756d ("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>

parent ad598a48

drivers/hid/hid-alps.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -734,7 +734,7 @@ static int alps_input_configured(struct hid_device hdev, struct hid_input hi)
		if (data->has_sp) {
		input2 = input_allocate_device();
		if (!input2) {
		input_free_device(input2);
		ret = -ENOMEM;
		goto exit;
		}