Commit 037c1aae authored by José Expósito's avatar José Expósito Committed by Jiri Kosina
Browse files

HID: input: do not query XP-PEN Deco LW battery 



The XP-PEN Deco LW drawing tablet can be connected by USB cable or using
a USB Bluetooth dongle. When it is connected using the dongle, there
might be a small delay until the tablet is paired with the dongle.

Fetching the device battery during this delay results in random battery
percentage values.

Add a quirk to avoid actively querying the battery percentage and wait
for the device to report it on its own.

Reported-by: default avatarMia Kanashi <chad@redpilled.dev>
Tested-by: default avatarMia Kanashi <chad@redpilled.dev>
Signed-off-by: default avatarJosé Expósito <jose.exposito89@gmail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 334fe5d3

drivers/hid/hid-input.c

+6 −0
Original line number Diff line number Diff line
@@ -340,6 +340,7 @@ static enum power_supply_property hidinput_battery_props[] = { 
#define HID_BATTERY_QUIRK_PERCENT	(1 << 0) /* always reports percent */

#define HID_BATTERY_QUIRK_FEATURE	(1 << 1) /* ask for feature report */

#define HID_BATTERY_QUIRK_IGNORE	(1 << 2) /* completely ignore the battery */

#define HID_BATTERY_QUIRK_AVOID_QUERY	(1 << 3) /* do not query the battery */



static const struct hid_device_id hid_battery_quirks[] = {

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,
@@ -373,6 +374,8 @@ static const struct hid_device_id hid_battery_quirks[] = { 
	  HID_BATTERY_QUIRK_IGNORE },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ELAN, USB_DEVICE_ID_ASUS_UX550VE_TOUCHSCREEN),

	  HID_BATTERY_QUIRK_IGNORE },

	{ HID_USB_DEVICE(USB_VENDOR_ID_UGEE, USB_DEVICE_ID_UGEE_XPPEN_TABLET_DECO_L),

	  HID_BATTERY_QUIRK_AVOID_QUERY },

	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_ENVY_X360_15),

	  HID_BATTERY_QUIRK_IGNORE },

	{ HID_I2C_DEVICE(USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_HP_ENVY_X360_15T_DR100),
@@ -554,6 +557,9 @@ static int hidinput_setup_battery(struct hid_device *dev, unsigned report_type, 
	dev->battery_avoid_query = report_type == HID_INPUT_REPORT &&

				   field->physical == HID_DG_STYLUS;



	if (quirks & HID_BATTERY_QUIRK_AVOID_QUERY)

		dev->battery_avoid_query = true;



	dev->battery = power_supply_register(&dev->dev, psy_desc, &psy_cfg);

	if (IS_ERR(dev->battery)) {

		error = PTR_ERR(dev->battery);