Merge branch 'for-4.20/i2c-hid' into for-linus (4e7be68e) · Commits · 戴 / test

drivers/hid/i2c-hid/Makefile

+3 −0

Original line number	Diff line number	Diff line
		@@ -3,3 +3,6 @@
		#

		obj-$(CONFIG_I2C_HID) += i2c-hid.o

		i2c-hid-objs = i2c-hid-core.o
		i2c-hid-$(CONFIG_DMI) += i2c-hid-dmi-quirks.o

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

+40 −20

Original line number	Diff line number	Diff line
		@@ -43,6 +43,7 @@
		#include <linux/platform_data/i2c-hid.h>

		#include "../hid-ids.h"
		#include "i2c-hid.h"

		/* quirks to control the device */
		#define I2C_HID_QUIRK_SET_PWR_WAKEUP_DEV BIT(0)
		@@ -668,6 +669,7 @@ static int i2c_hid_parse(struct hid_device *hid)
		char *rdesc;
		int ret;
		int tries = 3;
		char *use_override;

		i2c_hid_dbg(ihid, "entering %s\n", __func__);

		@@ -686,6 +688,13 @@ static int i2c_hid_parse(struct hid_device *hid)
		if (ret)
		return ret;

		use_override = i2c_hid_get_dmi_hid_report_desc_override(client->name,
		&rsize);

		if (use_override) {
		rdesc = use_override;
		i2c_hid_dbg(ihid, "Using a HID report descriptor override\n");
		} else {
		rdesc = kzalloc(rsize, GFP_KERNEL);

		if (!rdesc) {
		@@ -695,17 +704,21 @@ static int i2c_hid_parse(struct hid_device *hid)

		i2c_hid_dbg(ihid, "asking HID report descriptor\n");

		ret = i2c_hid_command(client, &hid_report_descr_cmd, rdesc, rsize);
		ret = i2c_hid_command(client, &hid_report_descr_cmd,
		rdesc, rsize);
		if (ret) {
		hid_err(hid, "reading report descriptor failed\n");
		kfree(rdesc);
		return -EIO;
		}
		}

		i2c_hid_dbg(ihid, "Report Descriptor: %*ph\n", rsize, rdesc);

		ret = hid_parse_report(hid, rdesc, rsize);
		if (!use_override)
		kfree(rdesc);

		if (ret) {
		dbg_hid("parsing report descriptor failed\n");
		return ret;
		@@ -832,13 +845,20 @@ static int i2c_hid_fetch_hid_descriptor(struct i2c_hid *ihid)
		int ret;

		/* i2c hid fetch using a fixed descriptor size (30 bytes) */
		if (i2c_hid_get_dmi_i2c_hid_desc_override(client->name)) {
		i2c_hid_dbg(ihid, "Using a HID descriptor override\n");
		ihid->hdesc =
		*i2c_hid_get_dmi_i2c_hid_desc_override(client->name);
		} else {
		i2c_hid_dbg(ihid, "Fetching the HID descriptor\n");
		ret = i2c_hid_command(client, &hid_descr_cmd, ihid->hdesc_buffer,
		ret = i2c_hid_command(client, &hid_descr_cmd,
		ihid->hdesc_buffer,
		sizeof(struct i2c_hid_desc));
		if (ret) {
		dev_err(&client->dev, "hid_descr_cmd failed\n");
		return -ENODEV;
		}
		}

		/* Validate the length of HID descriptor, the 4 first bytes:
		* bytes 0-1 -> length

drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c

0 → 100644

+376 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/hid/i2c-hid/i2c-hid.h

0 → 100644

+20 −0

Original line number	Diff line number	Diff line
		/* SPDX-License-Identifier: GPL-2.0+ */

		#ifndef I2C_HID_H
		#define I2C_HID_H


		#ifdef CONFIG_DMI
		struct i2c_hid_desc i2c_hid_get_dmi_i2c_hid_desc_override(uint8_t i2c_name);
		char i2c_hid_get_dmi_hid_report_desc_override(uint8_t i2c_name,
		unsigned int *size);
		#else
		static inline struct i2c_hid_desc
		i2c_hid_get_dmi_i2c_hid_desc_override(uint8_t i2c_name)
		{ return NULL; }
		static inline char i2c_hid_get_dmi_hid_report_desc_override(uint8_t i2c_name,
		unsigned int *size)
		{ return NULL; }
		#endif

		#endif

drivers/hid/intel-ish-hid/ipc/ipc.c

+14 −18

File changed.

Preview size limit exceeded, changes collapsed.

Admin message