HID: i2c-hid: Fix Elan touchpad regression
PATCH 1/1 HID: i2c-hid: Fix Elan touchpad regression
A quirk was recently added for Elan devices that has same device match as an entry earlier in the list. The i2c_hid_lookup_quirk function will always return the last match in the list, so the new entry shadows the old entry. The quirk in the previous entry, I2C_HID_QUIRK_BOGUS_IRQ, silenced a flood of messages which have reappeared in the 5.13 kernel.
This change moves the two quirk flags into the same entry.
--- drivers/hid/i2c-hid/i2c-hid-core.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/hid/i2c-hid/i2c-hid-core.c +2 -3
@@ -171,8 +171,6 @@ static const struct i2c_hid_quirks { I2C_HID_QUIRK_NO_IRQ_AFTER_RESET }, {I2C_VENDOR_ID_RAYDIUM ,I2C_PRODUCT_ID_RAYDIUM_3118 , I2C_HID_QUIRK_NO_IRQ_AFTER_RESET }, - { USB_VENDOR_ID_ELAN, HID_ANY_ID, - I2C_HID_QUIRK_BOGUS_IRQ }, { USB_VENDOR_ID_ALPS_JP, HID_ANY_ID, I2C_HID_QUIRK_RESET_ON_RESUME }, { I2C_VENDOR_ID_SYNAPTICS, I2C_PRODUCT_ID_SYNAPTICS_SYNA2393,
@@ -183,7 +181,8 @@ static const struct i2c_hid_quirks {* Sending the wakeup after reset actually break ELAN touchscreen controller */ {USB_VENDOR_ID_ELAN ,HID_ANY_ID , - I2C_HID_QUIRK_NO_WAKEUP_AFTER_RESET }, +I2C_HID_QUIRK_NO_WAKEUP_AFTER_RESET | + I2C_HID_QUIRK_BOGUS_IRQ }, { 0, 0 } };
Signature · 1 line
2.31.1
Quoted 8 lines
A quirk was recently added for Elan devices that has same device match as an entry earlier in the list. The
i2c_hid_lookup_quirkfunction will always return the last match in the list, so the new entry shadows the old entry. The quirk in the previous entry,I2C_HID_QUIRK_BOGUS_IRQ, silenced a flood of messages which have reappeared in the 5.13 kernel.This change moves the two quirk flags into the same entry.
LGTM
Many thanks,
Johnny/ELAN
Quoted 32 lines
Fixes ca66a6770bd9 (HID: i2c-hid: Skip ELAN power-on command after reset)Signed-off-by Jim Broadus <[email protected]>--- drivers/hid/i2c-hid/i2c-hid-core.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)drivers/hid/i2c-hid/i2c-hid-core.c +2
-4@@ -171,8 +171,6 @@ static const struct i2c_hid_quirks { I2C_HID_QUIRK_NO_IRQ_AFTER_RESET }, {I2C_VENDOR_ID_RAYDIUM ,I2C_PRODUCT_ID_RAYDIUM_3118 , I2C_HID_QUIRK_NO_IRQ_AFTER_RESET }, - { USB_VENDOR_ID_ELAN, HID_ANY_ID, - I2C_HID_QUIRK_BOGUS_IRQ }, { USB_VENDOR_ID_ALPS_JP, HID_ANY_ID, I2C_HID_QUIRK_RESET_ON_RESUME }, { I2C_VENDOR_ID_SYNAPTICS, I2C_PRODUCT_ID_SYNAPTICS_SYNA2393,@@ -183,7 +181,8 @@ static const struct i2c_hid_quirks {* Sending the wakeup after reset actually break ELAN touchscreen controller */ {USB_VENDOR_ID_ELAN ,HID_ANY_ID , - I2C_HID_QUIRK_NO_WAKEUP_AFTER_RESET }, +I2C_HID_QUIRK_NO_WAKEUP_AFTER_RESET | + I2C_HID_QUIRK_BOGUS_IRQ }, { 0, 0 } }; --2.31.1
Quoted 10 lines · Jim Broadus
A quirk was recently added for Elan devices that has same device match as an entry earlier in the list. The
i2c_hid_lookup_quirkfunction will always return the last match in the list, so the new entry shadows the old entry. The quirk in the previous entry,I2C_HID_QUIRK_BOGUS_IRQ, silenced a flood of messages which have reappeared in the 5.13 kernel.This change moves the two quirk flags into the same entry.
Fixes ca66a6770bd9 (HID: i2c-hid: Skip ELAN power-on command after reset)Signed-off-by Jim Broadus <[email protected]>
Applied, thank you.
Signature · 2 lines
Jiri Kosina SUSE Labs