From 95701b1fd2aefc2802334813898bfab0d77d0032 Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Sun, 28 Nov 2010 16:37:14 +0100 Subject: [PATCH] --- yaml --- r: 227601 b: refs/heads/master c: ce06b9d6d33fd2ed799b6e825d68fe95077da354 h: refs/heads/master i: 227599: 8c19aa2d42cebee6bc78030d61a29f0c11ead5ae v: v3 --- [refs] | 2 +- trunk/drivers/hid/hid-core.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4112a8b4599d..15ccae4e3ce7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b9e4b1e0cd401e915e3ba97afc152946f78f9f0b +refs/heads/master: ce06b9d6d33fd2ed799b6e825d68fe95077da354 diff --git a/trunk/drivers/hid/hid-core.c b/trunk/drivers/hid/hid-core.c index dc56bd61edb7..396f8c7e0076 100644 --- a/trunk/drivers/hid/hid-core.c +++ b/trunk/drivers/hid/hid-core.c @@ -1230,7 +1230,7 @@ void hid_disconnect(struct hid_device *hdev) EXPORT_SYMBOL_GPL(hid_disconnect); /* a list of devices for which there is a specialized driver on HID bus */ -static const struct hid_device_id hid_blacklist[] = { +static const struct hid_device_id hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_3M, USB_DEVICE_ID_3M1968) }, { HID_USB_DEVICE(USB_VENDOR_ID_3M, USB_DEVICE_ID_3M2256) }, { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU) }, @@ -1503,9 +1503,9 @@ static int hid_bus_match(struct device *dev, struct device_driver *drv) if (!hid_match_device(hdev, hdrv)) return 0; - /* generic wants all non-blacklisted */ + /* generic wants all that don't have specialized driver */ if (!strncmp(hdrv->name, "generic-", 8)) - return !hid_match_id(hdev, hid_blacklist); + return !hid_match_id(hdev, hid_have_special_driver); return 1; }