diff mbox series

[V2] input: ims-pcu: return error code rather than -ENOMEM

Message ID 20200603152151.139337-1-colin.king@canonical.com
State Accepted
Commit d431b9e6af1903e112f5f773a0137be4fe5b17e8
Headers show
Series [V2] input: ims-pcu: return error code rather than -ENOMEM | expand

Commit Message

Colin King June 3, 2020, 3:21 p.m. UTC 
From: Colin Ian King <colin.king@canonical.com>

Currently the assignment of -ENOMEM to error is redudant because error
is not being read and -ENOMEM is being hard coded as an error return.
Fix this by returning the error code in variable 'error'; this also
allows the error code from a failed call to input_register_device to
be preserved and returned to the caller rather than just returning
a possibly inappropriate -ENOMEM.

Kudos to Dan Carpenter for the suggestion of an improved fix.

Addresses-Coverity: ("Unused value")
Signed-off-by: Colin Ian King <colin.king@canonical.com>

---

V2: change subject line and return the error code rather than
    removing the ENOMEM assignment to error. Thanks to Dan Carpenter
    for explaining a better fix.

---
 drivers/input/misc/ims-pcu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Dmitry Torokhov Aug. 6, 2020, 10:34 p.m. UTC | #1 
On Wed, Jun 03, 2020 at 04:21:51PM +0100, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>

> 

> Currently the assignment of -ENOMEM to error is redudant because error

> is not being read and -ENOMEM is being hard coded as an error return.

> Fix this by returning the error code in variable 'error'; this also

> allows the error code from a failed call to input_register_device to

> be preserved and returned to the caller rather than just returning

> a possibly inappropriate -ENOMEM.

> 

> Kudos to Dan Carpenter for the suggestion of an improved fix.

> 

> Addresses-Coverity: ("Unused value")

> Signed-off-by: Colin Ian King <colin.king@canonical.com>

> 


Applied, thank you.

-- 
Dmitry
diff mbox series

Patch

diff --git a/drivers/input/misc/ims-pcu.c b/drivers/input/misc/ims-pcu.c
index d8dbfc030d0f..08b9b5cdb943 100644
--- a/drivers/input/misc/ims-pcu.c
+++ b/drivers/input/misc/ims-pcu.c
@@ -335,7 +335,7 @@  static int ims_pcu_setup_gamepad(struct ims_pcu *pcu)
 err_free_mem:
 	input_free_device(input);
 	kfree(gamepad);
-	return -ENOMEM;
+	return error;
 }
 
 static void ims_pcu_destroy_gamepad(struct ims_pcu *pcu)