diff options
| author |   Colin Ian King <colin.king@canonical.com> | 2020-10-30 14:30:02 +0000 |
|---|---|---|
| committer |   Jiri Kosina <jkosina@suse.cz> | 2020-11-12 16:25:40 +0100 |
| commit | 6e6eae04f5123b7b2f4265f7a702b5200fa5863b (patch) | |
| tree | ef801838ac33be7e46e1a1ffcf48f4be51b89f9d /drivers/hid | |
| parent | HID: SFH: Add documentation (diff) | |
| download | linux-dev-6e6eae04f5123b7b2f4265f7a702b5200fa5863b.tar.xz linux-dev-6e6eae04f5123b7b2f4265f7a702b5200fa5863b.zip | |
SFH: fix error return check for -ERESTARTSYS
Currently the check for the error return code -ERESTARTSYS is dead code
and never executed because a previous check for ret < 0 is catching this
and returning -ETIMEDOUT instead. Fix this by checking for -ERESTARTSYS
before the more generic negative error code.
Addresses-Coverity: ("Logically dead code")
Fixes: 4b2c53d93a4b ("SFH:Transport Driver to add support of AMD Sensor Fusion Hub (SFH)")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Reviewed-by: Sandeep Singh <sandeep.singh@amd.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/amd-sfh-hid/amd_sfh_hid.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/hid/amd-sfh-hid/amd_sfh_hid.c b/drivers/hid/amd-sfh-hid/amd_sfh_hid.c index a471079a3bd0..4f989483aa03 100644 --- a/drivers/hid/amd-sfh-hid/amd_sfh_hid.c +++ b/drivers/hid/amd-sfh-hid/amd_sfh_hid.c @@ -88,10 +88,10 @@ static int amdtp_wait_for_response(struct hid_device *hid) ret = wait_event_interruptible_timeout(hid_data->hid_wait, cli_data->request_done[i], msecs_to_jiffies(AMD_SFH_RESPONSE_TIMEOUT)); - if (ret < 0) - return -ETIMEDOUT; - else if (ret == -ERESTARTSYS) + if (ret == -ERESTARTSYS) return -ERESTARTSYS; + else if (ret < 0) + return -ETIMEDOUT; else return 0; } |