Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d3879bd authored by Benjamin Tissoires's avatar Benjamin Tissoires
Browse files

Merge branch 'for-5.1/upstream-fixes' into for-5.2/logitech

parents 1f87b0cd a50e8e2e

drivers/hid/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ config HID_ASUS 
	tristate "Asus"

	depends on LEDS_CLASS

	depends on ASUS_WMI || ASUS_WMI=n

	select POWER_SUPPLY

	---help---

	Support for Asus notebook built-in keyboard and touchpad via i2c, and

	the Asus Republic of Gamers laptop keyboard special keys.

drivers/hid/hid-core.c

+3 −3
Original line number Diff line number Diff line
@@ -1301,10 +1301,10 @@ static u32 __extract(u8 *report, unsigned offset, int n) 
u32 hid_field_extract(const struct hid_device *hid, u8 *report,

			unsigned offset, unsigned n)

{

	if (n > 32) {

		hid_warn(hid, "hid_field_extract() called with n (%d) > 32! (%s)\n",

	if (n > 256) {

		hid_warn(hid, "hid_field_extract() called with n (%d) > 256! (%s)\n",

			 n, current->comm);

		n = 32;

		n = 256;

	}



	return __extract(report, offset, n);

drivers/hid/hid-debug.c

+5 −0
Original line number Diff line number Diff line
@@ -1060,10 +1060,15 @@ static int hid_debug_rdesc_show(struct seq_file *f, void *p) 
	seq_printf(f, "\n\n");



	/* dump parsed data and input mappings */

	if (down_interruptible(&hdev->driver_input_lock))

		return 0;



	hid_dump_device(hdev, f);

	seq_printf(f, "\n");

	hid_dump_input_mapping(hdev, f);



	up(&hdev->driver_input_lock);



	return 0;

}

drivers/hid/hid-input.c

+1 −0
Original line number Diff line number Diff line
@@ -998,6 +998,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel 
		case 0x1b8: map_key_clear(KEY_VIDEO);		break;

		case 0x1bc: map_key_clear(KEY_MESSENGER);	break;

		case 0x1bd: map_key_clear(KEY_INFO);		break;

		case 0x1cb: map_key_clear(KEY_ASSISTANT);	break;

		case 0x201: map_key_clear(KEY_NEW);		break;

		case 0x202: map_key_clear(KEY_OPEN);		break;

		case 0x203: map_key_clear(KEY_CLOSE);		break;

drivers/hid/hid-logitech-hidpp.c

+10 −3
Original line number Diff line number Diff line
@@ -2107,6 +2107,13 @@ static int hidpp_ff_init(struct hidpp_device *hidpp, u8 feature_index) 
		kfree(data);

		return -ENOMEM;

	}

	data->wq = create_singlethread_workqueue("hidpp-ff-sendqueue");

	if (!data->wq) {

		kfree(data->effect_ids);

		kfree(data);

		return -ENOMEM;

	}



	data->hidpp = hidpp;

	data->feature_index = feature_index;

	data->version = version;
@@ -2151,7 +2158,6 @@ static int hidpp_ff_init(struct hidpp_device *hidpp, u8 feature_index) 
	/* ignore boost value at response.fap.params[2] */



	/* init the hardware command queue */

	data->wq = create_singlethread_workqueue("hidpp-ff-sendqueue");

	atomic_set(&data->workqueue_size, 0);



	/* initialize with zero autocenter to get wheel in usable state */
@@ -2604,6 +2610,7 @@ static int m560_raw_event(struct hid_device *hdev, u8 *data, int size) 
		input_report_rel(mydata->input, REL_Y, v);



		v = hid_snto32(data[6], 8);

		if (v != 0)

			hidpp_scroll_counter_handle_scroll(

					&hidpp->vertical_wheel_counter, v);