]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
HID: i2c-hid: fix inverted return value from i2c_hid_command()
authorJiri Kosina <jkosina@suse.cz>
Thu, 19 Apr 2018 07:25:15 +0000 (09:25 +0200)
committerKhalid Elmously <khalid.elmously@canonical.com>
Wed, 6 Jun 2018 15:50:20 +0000 (11:50 -0400)
BugLink: http://bugs.launchpad.net/bugs/1773233
commit b658912cb023cd6f8e46963d29779903d3c10538 upstream.

i2c_hid_command() returns non-zero in error cases (the actual
errno). Error handling in for I2C_HID_QUIRK_RESEND_REPORT_DESCR
case in i2c_hid_resume() had the check inverted; fix that.

Fixes: 3e83eda467 ("HID: i2c-hid: Fix resume issue on Raydium touchscreen device")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Cc: Aaron Ma <aaron.ma@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Acked-by: Khalid Elmously <khalid.elmously@canonical.com>
Acked-by: Brad Figg <brad.figg@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
drivers/hid/i2c-hid/i2c-hid.c

index 1536e3a11a575f123d337c93ea852a77d704c22c..37c04711024186797eb4866c37b9d3efb0655dcd 100644 (file)
@@ -1221,7 +1221,7 @@ static int i2c_hid_resume(struct device *dev)
         */
        if (ihid->quirks & I2C_HID_QUIRK_RESEND_REPORT_DESCR) {
                ret = i2c_hid_command(client, &hid_report_descr_cmd, NULL, 0);
-               if (!ret)
+               if (ret)
                        return ret;
        }