diff options
| author | Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2019-12-04 04:35:25 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2020-02-12 15:06:19 +0100 |
| commit | 8d2e77b39b8fecb794e19cd006a12f90b14dd077 (patch) | |
| tree | f54896fdf32f1cfd1d48711f02e134f30df8f848 /drivers/hid | |
| parent | 5c02c447eaeda29d3da121a2e17b97ccaf579b51 (diff) | |
| download | lwn-8d2e77b39b8fecb794e19cd006a12f90b14dd077.tar.gz lwn-8d2e77b39b8fecb794e19cd006a12f90b14dd077.zip | |
HID: alps: Fix an error handling path in 'alps_input_configured()'
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>
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/hid-alps.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |