lkml.org 
[lkml]   [2020]   [Feb]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] HID: alps: Fix an error handling path in 'alps_input_configured()'
On Wed, 4 Dec 2019, Christophe JAILLET wrote:

> 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>
> ---
> drivers/hid/hid-alps.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/hid/hid-alps.c b/drivers/hid/hid-alps.c
> index ae79a7c66737..fa704153cb00 100644
> --- a/drivers/hid/hid-alps.c
> +++ b/drivers/hid/hid-alps.c
> @@ -730,7 +730,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;
> }

Applied, thank you.

--
Jiri Kosina
SUSE Labs

\
 
 \ /
  Last update: 2020-02-12 15:08    [W:0.315 / U:0.164 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site