Commit 0f37cd03 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

HID: introduce list for hiddev creation forcing 



Introduce a list of devices for which there is need to
force a creation of the hiddev interface, but still they
are operated by generic driver (i.e. certain UPS).

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

drivers/hid/hid-core.c

+29 −18
Original line number Diff line number Diff line
@@ -1113,6 +1113,33 @@ int hid_input_report(struct hid_device *hid, int type, u8 *data, int size, int i 
}

EXPORT_SYMBOL_GPL(hid_input_report);



static bool hid_match_one_id(struct hid_device *hdev,

		const struct hid_device_id *id)

{

	return id->bus == hdev->bus &&

		(id->vendor == HID_ANY_ID || id->vendor == hdev->vendor) &&

		(id->product == HID_ANY_ID || id->product == hdev->product);

}



static const struct hid_device_id *hid_match_id(struct hid_device *hdev,

		const struct hid_device_id *id)

{

	for (; id->bus; id++)

		if (hid_match_one_id(hdev, id))

			return id;



	return NULL;

}



static const struct hid_device_id hid_hiddev_list[] = {

	{ }

};



static bool hid_hiddev(struct hid_device *hdev)

{

	return !!hid_match_id(hdev, hid_hiddev_list);

}



int hid_connect(struct hid_device *hdev, unsigned int connect_mask)

{

	static const char *types[] = { "Device", "Pointer", "Mouse", "Device",
@@ -1126,6 +1153,8 @@ int hid_connect(struct hid_device *hdev, unsigned int connect_mask) 


	if (hdev->bus != BUS_USB)

		connect_mask &= ~HID_CONNECT_HIDDEV;

	if (hid_hiddev(hdev))

		connect_mask |= HID_CONNECT_HIDDEV_FORCE;



	if ((connect_mask & HID_CONNECT_HIDINPUT) && !hidinput_connect(hdev,

				connect_mask & HID_CONNECT_HIDINPUT_FORCE))
@@ -1187,24 +1216,6 @@ int hid_connect(struct hid_device *hdev, unsigned int connect_mask) 
}

EXPORT_SYMBOL_GPL(hid_connect);



static bool hid_match_one_id(struct hid_device *hdev,

		const struct hid_device_id *id)

{

	return id->bus == hdev->bus &&

		(id->vendor == HID_ANY_ID || id->vendor == hdev->vendor) &&

		(id->product == HID_ANY_ID || id->product == hdev->product);

}



static const struct hid_device_id *hid_match_id(struct hid_device *hdev,

		const struct hid_device_id *id)

{

	for (; id->bus; id++)

		if (hid_match_one_id(hdev, id))

			return id;



	return NULL;

}



static const struct hid_device_id hid_blacklist[] = {

	{ HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_X5_005D) },