Commit bd008acd authored by Hans de Goede's avatar Hans de Goede Committed by Jiri Kosina
Browse files

HID: i2c-hid: Remove I2C_HID_QUIRK_SET_PWR_WAKEUP_DEV quirk 



Re-trying the power-on command on failure on all devices should
not be a problem, drop the I2C_HID_QUIRK_SET_PWR_WAKEUP_DEV quirk
and simply retry power-on on all devices.

Reviewed-by: default avatarDouglas Anderson <dianders@chromium.org>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.com>
parent 7bcf9ebb

drivers/hid/i2c-hid/i2c-hid-core.c

+1 −5
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ 
#include "i2c-hid.h"



/* quirks to control the device */

#define I2C_HID_QUIRK_SET_PWR_WAKEUP_DEV	BIT(0)

#define I2C_HID_QUIRK_NO_IRQ_AFTER_RESET	BIT(1)

#define I2C_HID_QUIRK_BOGUS_IRQ			BIT(4)

#define I2C_HID_QUIRK_RESET_ON_RESUME		BIT(5)
@@ -120,8 +119,6 @@ static const struct i2c_hid_quirks { 
	__u16 idProduct;

	__u32 quirks;

} i2c_hid_quirks[] = {

	{ USB_VENDOR_ID_WEIDA, HID_ANY_ID,

		I2C_HID_QUIRK_SET_PWR_WAKEUP_DEV },

	{ I2C_VENDOR_ID_HANTICK, I2C_PRODUCT_ID_HANTICK_5288,

		I2C_HID_QUIRK_NO_IRQ_AFTER_RESET },

	{ I2C_VENDOR_ID_ITE, I2C_DEVICE_ID_ITE_VOYO_WINPAD_A15,
@@ -395,8 +392,7 @@ static int i2c_hid_set_power(struct i2c_hid *ihid, int power_state) 
	 * The call will get a return value (EREMOTEIO) but device will be

	 * triggered and activated. After that, it goes like a normal device.

	 */

	if (power_state == I2C_HID_PWR_ON &&

	    ihid->quirks & I2C_HID_QUIRK_SET_PWR_WAKEUP_DEV) {

	if (power_state == I2C_HID_PWR_ON) {

		ret = i2c_hid_set_power_command(ihid, I2C_HID_PWR_ON);



		/* Device was already activated */