Re: HID: kye: Add report fixup for Genius Manticore Keyboard

From: Benjamin Tissoires
Date: Mon Dec 02 2013 - 09:33:02 EST


On 02/12/13 09:28, Dave Jones wrote:
> On Mon, Dec 02, 2013 at 03:16:24PM +0100, Jiri Kosina wrote:
> > On Sat, 30 Nov 2013, Dave Jones wrote:
> >
> > > > Commit: 4a2c94c9b6c03af61b04993340bd9559e2277de4
> > > > Author: Benjamin Tissoires <benjamin.tissoires@xxxxxxxxxx>
> > > > AuthorDate: Wed Nov 20 09:49:41 2013 -0500
> > > > Committer: Jiri Kosina <jkosina@xxxxxxx>
> > > > CommitDate: Thu Nov 21 10:28:58 2013 +0100
> > > >
> > > > HID: kye: Add report fixup for Genius Manticore Keyboard
> > > >
> > > > Genius Manticore Keyboard presents the same problem in its report
> > > > descriptors than Genius Gila Gaming Mouse and Genius Imperator Keyboard.
> > > > Use the same fixup.
> > >
> > > ..
> > >
> > > > diff --git a/drivers/hid/hid-kye.c b/drivers/hid/hid-kye.c
> > > > index 7384512..35a4f9c 100644
> > > > --- a/drivers/hid/hid-kye.c
> > > > +++ b/drivers/hid/hid-kye.c
> > > > @@ -341,6 +341,9 @@ static __u8 *kye_report_fixup(struct hid_device *hdev, __u8 *rdesc,
> > > > case USB_DEVICE_ID_GENIUS_GX_IMPERATOR:
> > > > rdesc = kye_consumer_control_fixup(hdev, rdesc, rsize, 83,
> > > > "Genius Gx Imperator Keyboard");
> > > > + case USB_DEVICE_ID_GENIUS_MANTICORE:
> > > > + rdesc = kye_consumer_control_fixup(hdev, rdesc, rsize, 104,
> > > > + "Genius Manticore Keyboard");
> > > > break;
> > >
> > >
> > > Is the IMPERATOR case supposed to fall-through to MANTICORE here, or is there a missing break ?
> > > The commit text describes using the same fixup, but has this alternative case.
> >
> > I am almost certain that the missing break is a mistake, and the offsets
> > in both report descriptors are just different, and there is no need for
> > two fixups.
> >
> > I am queuing this for 3.13 still, but having final confirmation from
> > Benjamin would of course be nice.
>
> If that is the case..
>

Hi guys,

(sorry for the late answer, last week was Thanksgiving, and I was
enjoying US public holidays)

Definitively, this is my mistake. Thanks Dave for spotting it.

Jiri, I'll try to hold on the 3.12 stable queue on this one too (or ask
to add Dave's patch).

Cheers,
Benjamin
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/