updating patch for keyboard identification

patches/4.17/keyboards_and_covers.patch

@@ -1,8 +1,8 @@
 diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
-index 46f5ecd11bf7..a74ae4c02062 100644
+index 46f5ecd11bf7..cceb745d2805 100644
 --- a/drivers/hid/hid-ids.h
 +++ b/drivers/hid/hid-ids.h
-@@ -791,11 +791,22 @@
+@@ -791,11 +791,21 @@
  #define USB_DEVICE_ID_MS_DIGITAL_MEDIA_3KV1 0x0732
  #define USB_DEVICE_ID_MS_DIGITAL_MEDIA_600  0x0750
  #define USB_DEVICE_ID_MS_COMFORT_MOUSE_4500	0x076c
@@ -25,13 +25,26 @@ index 46f5ecd11bf7..a74ae4c02062 100644
 +#define USB_DEVICE_ID_MS_SURFACE_BOOK		0x07cd
 +#define USB_DEVICE_ID_MS_SURFACE_BOOK_2		0x0922
 +#define USB_DEVICE_ID_MS_SURFACE_LAPTOP		0xf001
-+#define HID_DEVICE_ID_MS_SURFACE_LAPTOP		0xf001
 +#define USB_DEVICE_ID_MS_POWER_COVER		0x07da
  
  #define USB_VENDOR_ID_MOJO		0x8282
  #define USB_DEVICE_ID_RETRO_ADAPTER	0x3201
+diff --git a/drivers/hid/hid-microsoft.c b/drivers/hid/hid-microsoft.c
+index 96e7d3231d2f..e55097221eec 100644
+--- a/drivers/hid/hid-microsoft.c
++++ b/drivers/hid/hid-microsoft.c
+@@ -278,7 +278,8 @@ static const struct hid_device_id ms_devices[] = {
+ 		.driver_data = MS_HIDINPUT },
+ 	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_COMFORT_KEYBOARD),
+ 		.driver_data = MS_ERGONOMY},
+-
++	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_LAPTOP),
++		.driver_data = MS_HIDINPUT},
+ 	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PRESENTER_8K_BT),
+ 		.driver_data = MS_PRESENTER },
+ 	{ }
 diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
-index 1e561872a17f..dd863271e22c 100644
+index 1e561872a17f..8b7509ed5775 100644
 --- a/drivers/hid/hid-multitouch.c
 +++ b/drivers/hid/hid-multitouch.c
 @@ -1744,6 +1744,58 @@ static const struct hid_device_id mt_devices[] = {
@@ -83,7 +96,7 @@ index 1e561872a17f..dd863271e22c 100644
 +	{ .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
 +		HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY,
 +			USB_VENDOR_ID_MICROSOFT,
-+			HID_DEVICE_ID_MS_SURFACE_LAPTOP) },
++			USB_DEVICE_ID_MS_SURFACE_LAPTOP) },
 +
 +	/* Microsoft Power Cover */
 +	{ .driver_data = MT_CLS_EXPORT_ALL_INPUTS,
@@ -94,7 +107,7 @@ index 1e561872a17f..dd863271e22c 100644
  	{ .driver_data = MT_CLS_CONFIDENCE_MINUS_ONE,
  		MT_USB_DEVICE(USB_VENDOR_ID_ASUS,
 diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c
-index 587e2681a53f..995b71e3c6a0 100644
+index 587e2681a53f..4a5e335006d7 100644
 --- a/drivers/hid/hid-quirks.c
 +++ b/drivers/hid/hid-quirks.c
 @@ -111,6 +111,16 @@ static const struct hid_device_id hid_quirks[] = {
@@ -110,7 +123,7 @@ index 587e2681a53f..995b71e3c6a0 100644
 +	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_1), HID_QUIRK_NO_INIT_REPORTS },
 +	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_BOOK), HID_QUIRK_NO_INIT_REPORTS },
 +	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_BOOK_2), HID_QUIRK_NO_INIT_REPORTS },
-+	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_LAPTOP), HID_QUIRK_NO_INIT_REPORTS },
++	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE_LAPTOP), HID_QUIRK_ALWAYS_POLL },
  	{ HID_USB_DEVICE(USB_VENDOR_ID_MOJO, USB_DEVICE_ID_RETRO_ADAPTER), HID_QUIRK_MULTI_INPUT },
  	{ HID_USB_DEVICE(USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL), HID_QUIRK_NO_INIT_REPORTS },
  	{ HID_USB_DEVICE(USB_VENDOR_ID_MULTIPLE_1781, USB_DEVICE_ID_RAPHNET_4NES4SNES_OLD), HID_QUIRK_MULTI_INPUT },