Commit 87c7ee7a authored by Luke D. Jones's avatar Luke D. Jones Committed by Jiri Kosina
Browse files

HID: asus: Prevent Claymore sending suspend event 



Prevent the ASUS Claymore keyboard from sending a suspend event
when the device sleeps itself. The suspend event causes a system
suspend if uncaught.

Signed off by: Luke D Jones <luke@ljones.dev>

Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent fbf42729

drivers/hid/hid-asus.c

+15 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ MODULE_DESCRIPTION("Asus HID Keyboard and TouchPad"); 
#define QUIRK_T90CHI			BIT(9)

#define QUIRK_MEDION_E1239T		BIT(10)

#define QUIRK_ROG_NKEY_KEYBOARD		BIT(11)

#define QUIRK_ROG_CLAYMORE_II_KEYBOARD BIT(12)



#define I2C_KEYBOARD_QUIRKS			(QUIRK_FIX_NOTEBOOK_REPORT | \

						 QUIRK_NO_INIT_REPORTS | \
@@ -366,6 +367,17 @@ static int asus_raw_event(struct hid_device *hdev, 


	}



	if (drvdata->quirks & QUIRK_ROG_CLAYMORE_II_KEYBOARD) {

		/*

		 * CLAYMORE II keyboard sends this packet when it goes to sleep

		 * this causes the whole system to go into suspend.

		*/



		if(size == 2 && data[0] == 0x02 && data[1] == 0x00) {

			return -1;

		}

	}



	return 0;

}
@@ -1225,6 +1237,9 @@ static const struct hid_device_id asus_devices[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,

	    USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD2),

	  QUIRK_USE_KBD_BACKLIGHT | QUIRK_ROG_NKEY_KEYBOARD },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,

	    USB_DEVICE_ID_ASUSTEK_ROG_CLAYMORE_II_KEYBOARD),

	  QUIRK_ROG_CLAYMORE_II_KEYBOARD },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,

		USB_DEVICE_ID_ASUSTEK_T100TA_KEYBOARD),

	  QUIRK_T100_KEYBOARD | QUIRK_NO_CONSUMER_USAGES },

drivers/hid/hid-ids.h

+1 −0
Original line number Diff line number Diff line
@@ -197,6 +197,7 @@ 
#define USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD3 0x1822

#define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD	0x1866

#define USB_DEVICE_ID_ASUSTEK_ROG_NKEY_KEYBOARD2	0x19b6

#define USB_DEVICE_ID_ASUSTEK_ROG_CLAYMORE_II_KEYBOARD	0x196b

#define USB_DEVICE_ID_ASUSTEK_FX503VD_KEYBOARD	0x1869



#define USB_VENDOR_ID_ATEN		0x0557