diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-11-28 16:37:14 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-11-28 16:37:14 +0100 |
| commit | ce06b9d6d33fd2ed799b6e825d68fe95077da354 (patch) | |
| tree | c74cc78216a57f12f0088114733d53d7d075b8e7 /drivers/hid | |
| parent | b9e4b1e0cd401e915e3ba97afc152946f78f9f0b (diff) | |
| download | op-kernel-dev-ce06b9d6d33fd2ed799b6e825d68fe95077da354.zip op-kernel-dev-ce06b9d6d33fd2ed799b6e825d68fe95077da354.tar.gz | |
HID: hid-core - rename hid_blacklist to hid_have_special_driver
To avoid confusion with hid_blacklist describing various quirks in
usbhid code, let's rename this one.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/hid-core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index dc56bd6..396f8c7 100644 --- a/drivers/hid/hid-core.c +++ b/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; } |
