[PATCH] Fix Numlock led on two keyboards (Dell SK8115 and Bright)

[PATCH] Fix Numlock led on two keyboards (Dell SK8115 and Bright)

[Mauro Carvalho Chehab]

While testing two new USB keyboards, it was noticed that the NUM LOCK
led were wrong after booting. The led was ON, but the device was working
without numlock.

Adding those two devices to HID quirks table fixed the issue.

The keyboards are:
DELL SK8115 (USB ID 413c:2105); and
Bright keyboard (USB ID 1241:1503).

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>


diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index b15f882..7204c56 100644
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -101,6 +101,9 @@
 #define USB_VENDOR_ID_BERKSHIRE		0x0c98
 #define USB_DEVICE_ID_BERKSHIRE_PCWD	0x1140
 
+#define USB_VENDOR_ID_BRIGHT		0x1241
+#define USB_DEVICE_ID_BRIGHT_KBD	0x1503
+
 #define USB_VENDOR_ID_CHERRY		0x046a
 #define USB_DEVICE_ID_CHERRY_CYMOTION	0x0023
 
@@ -128,6 +131,7 @@
 
 #define USB_VENDOR_ID_DELL		0x413c
 #define USB_DEVICE_ID_DELL_W7658	0x2005
+#define USB_DEVICE_ID_DELL_SK8115	0x2105
 
 #define USB_VENDOR_ID_DELORME		0x1163
 #define USB_DEVICE_ID_DELORME_EARTHMATE 0x0100
@@ -663,7 +667,9 @@ static const struct hid_blacklist {
 	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
 	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY, HID_QUIRK_APPLE_NUMLOCK_EMULATION | HID_QUIRK_APPLE_HAS_FN | HID_QUIRK_IGNORE_MOUSE },
 
+	{ USB_VENDOR_ID_BRIGHT, USB_DEVICE_ID_BRIGHT_KBD, HID_QUIRK_RESET_LEDS },
 	{ USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_W7658, HID_QUIRK_RESET_LEDS },
+	{ USB_VENDOR_ID_DELL, USB_DEVICE_ID_DELL_SK8115, HID_QUIRK_RESET_LEDS },
 	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_KBD, HID_QUIRK_RESET_LEDS },
 	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY, HID_QUIRK_IGNORE },
 	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_2, HID_QUIRK_IGNORE },

Re: [PATCH] Fix Numlock led on two keyboards (Dell SK8115 and Bright)

[Jiri Kosina]

On Thu, 9 Oct 2008, Mauro Carvalho Chehab wrote:

> While testing two new USB keyboards, it was noticed that the NUM LOCK 
> led were wrong after booting. The led was ON, but the device was working 
> without numlock.
> Adding those two devices to HID quirks table fixed the issue.
> The keyboards are:
> DELL SK8115 (USB ID 413c:2105); and
> Bright keyboard (USB ID 1241:1503).

Hi Mauro,

the HID subsystem went through a refactoring, and all the quirks have been 
separated into individual drivers, so that the code doens't become 
unmaintainable mess by having quirks all over the place.

The changes have been present in my git tree -next for quite some time, 
and I am planning to send a push request to Linus probably tomorrow. Do 
you think you could rebase your patch on top of my tree?

For Dell changes this should be trivial, as there is already a driver 
handling exactly this for other Dell keyboards.

Thanks,

-- 
Jiri Kosina
SUSE Labs

Re: [PATCH] Fix Numlock led on two keyboards (Dell SK8115 and Bright)

[Mauro Carvalho Chehab]

Hi Jiri,

On Mon, 13 Oct 2008 17:49:52 +0200 (CEST)
Jiri Kosina <jkosina@suse.cz> wrote:

> > The keyboards are:
> > DELL SK8115 (USB ID 413c:2105); and
> > Bright keyboard (USB ID 1241:1503).

> the HID subsystem went through a refactoring, and all the quirks have been 
> separated into individual drivers, so that the code doens't become 
> unmaintainable mess by having quirks all over the place.
> 
> The changes have been present in my git tree -next for quite some time, 
> and I am planning to send a push request to Linus probably tomorrow. Do 
> you think you could rebase your patch on top of my tree?
> 
> For Dell changes this should be trivial, as there is already a driver 
> handling exactly this for other Dell keyboards.

Ok, I've rebased the patches, from 'next-20080919' tag, at -next. I'll be
sending you the patches on the next emails.

In the case of the Bright keyboard, I've cloned Dell entry, since the problem
is similar.

-- 

Cheers,
Mauro