From: Jiri Kosina <jkosina@suse.cz>
Date: Tue, 5 Mar 2019 14:42:51 +0000 (+0100)
Subject: Merge branch 'for-5.1/i2c-hid' into for-linus
X-Git-Tag: v5.1-rc1~115^2~1
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=9f66d83ed704bc9ac0f09eb744f8e76a81006eb9;p=linux-block.git

Merge branch 'for-5.1/i2c-hid' into for-linus

Fix dmesg flood for Elan touchpanels which are too slow to assert IRQ from Kai-Heng Feng
---

9f66d83ed704bc9ac0f09eb744f8e76a81006eb9
diff --cc drivers/hid/i2c-hid/i2c-hid-core.c
index c5edfa966343,2f940c1de616..90164fed08d3
--- a/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 }
  };