| Message ID | 20190411090203.25269-1-hui.wang@canonical.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 20522fefd52277c006ddae43dafc497b99e2f2f8 |
| Delegated to: | Jiri Kosina |
| Headers | show |
| Series | Revert "HID: i2c-hid: Disable runtime PM on Synaptics touchpad" | expand |
On Thu, 11 Apr 2019, Hui Wang wrote: > This reverts commit 74e7c6c877f620d65a8269692d089bbd066f626c. > > It finally turns out the touchpad is an engineering sample and it is > not the Synaptics touchpad. Let us revert this patch otherwise it will > affect the real Synaptics touchpad. > > Signed-off-by: Hui Wang <hui.wang@canonical.com> Applied to for-5.1/upstream-fixes, thanks.
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index adce58f24f76..b6d93f4ad037 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -1083,7 +1083,6 @@ #define USB_DEVICE_ID_SYNAPTICS_HD 0x0ac3 #define USB_DEVICE_ID_SYNAPTICS_QUAD_HD 0x1ac3 #define USB_DEVICE_ID_SYNAPTICS_TP_V103 0x5710 -#define I2C_DEVICE_ID_SYNAPTICS_7E7E 0x7e7e #define USB_VENDOR_ID_TEXAS_INSTRUMENTS 0x2047 #define USB_DEVICE_ID_TEXAS_INSTRUMENTS_LENOVO_YOGA 0x0855 diff --git a/drivers/hid/i2c-hid/i2c-hid-core.c b/drivers/hid/i2c-hid/i2c-hid-core.c index 4d1f24ee249c..90164fed08d3 100644 --- a/drivers/hid/i2c-hid/i2c-hid-core.c +++ b/drivers/hid/i2c-hid/i2c-hid-core.c @@ -184,8 +184,6 @@ static const struct i2c_hid_quirks { I2C_HID_QUIRK_NO_RUNTIME_PM }, { USB_VENDOR_ID_ELAN, HID_ANY_ID, I2C_HID_QUIRK_BOGUS_IRQ }, - { USB_VENDOR_ID_SYNAPTICS, I2C_DEVICE_ID_SYNAPTICS_7E7E, - I2C_HID_QUIRK_NO_RUNTIME_PM }, { 0, 0 } };
This reverts commit 74e7c6c877f620d65a8269692d089bbd066f626c. It finally turns out the touchpad is an engineering sample and it is not the Synaptics touchpad. Let us revert this patch otherwise it will affect the real Synaptics touchpad. Signed-off-by: Hui Wang <hui.wang@canonical.com> --- drivers/hid/hid-ids.h | 1 - drivers/hid/i2c-hid/i2c-hid-core.c | 2 -- 2 files changed, 3 deletions(-)