[PATCH -next] HID: alps: fix error return code in alps_input_configured()

From: Wei Yongjun <redacted>

Fix to return a negative error code from the error handling
case instead of 0, as done elsewhere in this function.

Signed-off-by: Wei Yongjun <redacted>
---
 drivers/hid/hid-alps.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/hid/hid-alps.c b/drivers/hid/hid-alps.c
index 2808da9..507372e 100644
--- a/drivers/hid/hid-alps.c
+++ b/drivers/hid/hid-alps.c

@@ -384,7 +384,7 @@ static int alps_input_configured(struct hid_device *hdev, struct hid_input *hi)
 
 		input2 = input_allocate_device();
 		if (!input2) {
-			input_free_device(input2);
+			ret = -ENOMEM;
 			goto exit;
 		}
 

@@ -426,7 +426,8 @@ static int alps_input_configured(struct hid_device *hdev, struct hid_input *hi)
 		__set_bit(INPUT_PROP_POINTER, input2->propbit);
 		__set_bit(INPUT_PROP_POINTING_STICK, input2->propbit);
 
-		if (input_register_device(data->input2)) {
+		ret = input_register_device(data->input2);
+		if (ret) {
 			input_free_device(input2);
 			goto exit;
 		}

On Sep 21 2016 or thereabouts, Wei Yongjun wrote:

Tiny nitpick: this change is not entirely related to the patch and
commit message. But it's OK-ish carrying this over through this patch.
(it's basically a no-op given that input2 is null).

Reviewed-by: Benjamin Tissoires <redacted>

Cheers,
Benjamin

On Thu, 22 Sep 2016, Benjamin Tissoires wrote:

quoted

Fix to return a negative error code from the error handling
case instead of 0, as done elsewhere in this function.

Signed-off-by: Wei Yongjun <redacted>
---
 drivers/hid/hid-alps.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/hid/hid-alps.c b/drivers/hid/hid-alps.c
index 2808da9..507372e 100644
--- a/drivers/hid/hid-alps.c
+++ b/drivers/hid/hid-alps.c

@@ -384,7 +384,7 @@ static int alps_input_configured(struct hid_device *hdev, struct hid_input *hi)
 
 		input2 = input_allocate_device();
 		if (!input2) {
-			input_free_device(input2);

Tiny nitpick: this change is not entirely related to the patch and
commit message. But it's OK-ish carrying this over through this patch.
(it's basically a no-op given that input2 is null).

Reviewed-by: Benjamin Tissoires <redacted>

Fair enough; I've ammended the changelog to reflect the removal of 
superfluous input_free_device() call and applied, thanks.

-- 
Jiri Kosina
SUSE Labs