projects
/
linux-2.6-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
edaea3d
09cc8b3
)
Merge branch 'for-5.1/i2c-hid' into for-linus
author
Jiri Kosina
<jkosina@suse.cz>
Tue, 5 Mar 2019 14:42:51 +0000
(15:42 +0100)
committer
Jiri Kosina
<jkosina@suse.cz>
Tue, 5 Mar 2019 14:42:51 +0000
(15:42 +0100)
Fix dmesg flood for Elan touchpanels which are too slow to assert IRQ from Kai-Heng Feng
1
2
drivers/hid/i2c-hid/i2c-hid-core.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/hid/intel-ish-hid/ipc/ipc.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/hid/intel-ish-hid/ishtp/bus.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/hid/intel-ish-hid/ishtp/bus.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/hid/i2c-hid/i2c-hid-core.c
index c5edfa966343dc098c63af7d4513ffeed02348de,2f940c1de6169724b6f629787496b8bf4d9f9268..90164fed08d35eca2c34250c8b7cb3814ea99f53
---
1
/
drivers/hid/i2c-hid/i2c-hid-core.c
---
2
/
drivers/hid/i2c-hid/i2c-hid-core.c
+++ b/
drivers/hid/i2c-hid/i2c-hid-core.c
@@@
-179,8
-180,8
+180,10
@@@
static const struct i2c_hid_quirks
I2C_HID_QUIRK_DELAY_AFTER_SLEEP },
{ USB_VENDOR_ID_LG, I2C_DEVICE_ID_LG_8001,
I2C_HID_QUIRK_NO_RUNTIME_PM },
+ { I2C_VENDOR_ID_GOODIX, I2C_DEVICE_ID_GOODIX_01F0,
+ I2C_HID_QUIRK_NO_RUNTIME_PM },
+ { USB_VENDOR_ID_ELAN, HID_ANY_ID,
+ I2C_HID_QUIRK_BOGUS_IRQ },
{ 0, 0 }
};
diff --cc
drivers/hid/intel-ish-hid/ipc/ipc.c
Simple merge
diff --cc
drivers/hid/intel-ish-hid/ishtp/bus.c
Simple merge
diff --cc
drivers/hid/intel-ish-hid/ishtp/bus.h
Simple merge