diff options
| author | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2016-12-10 21:58:55 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2016-12-12 09:47:31 +0100 |
| commit | 8cd16166b0002df427ed39e4970e0be4830199b2 (patch) | |
| tree | c694d53bc91d088b718ed9f8a4f16a3f3740e104 /drivers/hid/i2c-hid | |
| parent | ba1660f1791f31a76da247caebf273b3f3d5071c (diff) | |
| download | blackbird-op-linux-8cd16166b0002df427ed39e4970e0be4830199b2.tar.gz blackbird-op-linux-8cd16166b0002df427ed39e4970e0be4830199b2.zip | |
HID: fix missing irq field
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>
Diffstat (limited to 'drivers/hid/i2c-hid')
| -rw-r--r-- | drivers/hid/i2c-hid/i2c-hid.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hid/i2c-hid/i2c-hid.c b/drivers/hid/i2c-hid/i2c-hid.c index 5b90ddaa9350..78fb32a7b103 100644 --- a/drivers/hid/i2c-hid/i2c-hid.c +++ b/drivers/hid/i2c-hid/i2c-hid.c @@ -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; |
