diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-14 09:08:47 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2008-10-14 17:51:03 -0400 |
| commit | 0dc491682f6e673a14c643d9a3e7305ce4616b96 (patch) | |
| tree | be3f6773ac004864f28d12a8ebc521a6489bbdcb | |
| parent | 7d89fe12bd21f1383a6a240114221bf31fd71904 (diff) | |
HID: fix numlock led on Dell device 0x413c/0x2105
This keyboard needs to re-sync numlock after probing.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| -rw-r--r-- | drivers/hid/hid-core.c | 1 | ||||
| -rw-r--r-- | drivers/hid/hid-dell.c | 1 | ||||
| -rw-r--r-- | drivers/hid/hid-ids.h | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 5a23077175e6..d749447a682d 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c | |||
| @@ -1258,6 +1258,7 @@ static const struct hid_device_id hid_blacklist[] = { | |||
| 1258 | { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2) }, | 1258 | { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_BARCODE_2) }, |
| 1259 | { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_MOUSE) }, | 1259 | { HID_USB_DEVICE(USB_VENDOR_ID_CYPRESS, USB_DEVICE_ID_CYPRESS_MOUSE) }, |
| 1260 | { HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_W7658) }, | 1260 | { HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_W7658) }, |
| 1261 | { HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_SK8115) }, | ||
| 1261 | { HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) }, | 1262 | { HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) }, |
| 1262 | { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE) }, | 1263 | { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE) }, |
| 1263 | { HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) }, | 1264 | { HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) }, |
diff --git a/drivers/hid/hid-dell.c b/drivers/hid/hid-dell.c index 98ee40e8751f..1a0d0dfc62fc 100644 --- a/drivers/hid/hid-dell.c +++ b/drivers/hid/hid-dell.c | |||
| @@ -47,6 +47,7 @@ err_free: | |||
| 47 | 47 | ||
| 48 | static const struct hid_device_id dell_devices[] = { | 48 | static const struct hid_device_id dell_devices[] = { |
| 49 | { HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_W7658) }, | 49 | { HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_W7658) }, |
| 50 | { HID_USB_DEVICE(USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_SK8115) }, | ||
| 50 | { } | 51 | { } |
| 51 | }; | 52 | }; |
| 52 | MODULE_DEVICE_TABLE(hid, dell_devices); | 53 | MODULE_DEVICE_TABLE(hid, dell_devices); |
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index df9c4f92c4a6..89c5cc169439 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
| @@ -133,6 +133,7 @@ | |||
| 133 | 133 | ||
| 134 | #define USB_VENDOR_ID_DELL 0x413c | 134 | #define USB_VENDOR_ID_DELL 0x413c |
| 135 | #define USB_DEVICE_ID_DELL_W7658 0x2005 | 135 | #define USB_DEVICE_ID_DELL_W7658 0x2005 |
| 136 | #define USB_DEVICE_ID_DELL_SK8115 0x2105 | ||
| 136 | 137 | ||
| 137 | #define USB_VENDOR_ID_DELORME 0x1163 | 138 | #define USB_VENDOR_ID_DELORME 0x1163 |
| 138 | #define USB_DEVICE_ID_DELORME_EARTHMATE 0x0100 | 139 | #define USB_DEVICE_ID_DELORME_EARTHMATE 0x0100 |
