]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
HID: fix missing irq field
authorBenjamin Tissoires <benjamin.tissoires@redhat.com>
Sat, 10 Dec 2016 20:58:55 +0000 (21:58 +0100)
committerJiri Kosina <jkosina@suse.cz>
Mon, 12 Dec 2016 08:47:31 +0000 (09:47 +0100)
commit ba18a9314a94 ("Revert "HID: i2c-hid: Add support for ACPI GPIO
interrupts"") removed the need for storing the irq in struct i2c_hid.

But then commit de3c99488609 ("HID: i2c-hid: Disable IRQ before freeing
buffers") forgot to update the location of the irq.

Fix this by using the actual I2C client irq.

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
drivers/hid/i2c-hid/i2c-hid.c

index 5b90ddaa935007219990b61a82daebf7779638b2..78fb32a7b103446136000c8ee9ac64cf7fba7054 100644 (file)
@@ -770,11 +770,11 @@ static int i2c_hid_start(struct hid_device *hid)
        i2c_hid_find_max_report(hid, HID_FEATURE_REPORT, &bufsize);
 
        if (bufsize > ihid->bufsize) {
-               disable_irq(ihid->irq);
+               disable_irq(client->irq);
                i2c_hid_free_buffers(ihid);
 
                ret = i2c_hid_alloc_buffers(ihid, bufsize);
-               enable_irq(ihid->irq);
+               enable_irq(client->irq);
 
                if (ret)
                        return ret;