2013-09-01 13:25:51

by Henrik Rydberg

Subject: [PATCH] HID: Correct the USB IDs for the new Macbook Air 6

A recent patch (9d9a04ee) added support for the new machine, but got
the sequence of USB ids wrong. Reports from both Ian and Linus T show
that the 0x0291 id is for ISO, not ANSI, which should have the missing
number 0x0290. This patchs moves the three numbers accordingly, fixing
the problem.

Cc: Dmitry Torokhov <[email protected]>
Reported-and-tested-by: Ian Munsie <[email protected]>
Tested-by: Linus G Thiel <[email protected]>
Signed-off-by: Henrik Rydberg <[email protected]>
---
Hi Jiri, Dmitry,

it looks like this change has been sufficiently tested now, in
addition to making perfect sense. Jiri, would you mind taking it, if
Dmitry approves?

The patch should go to stable as well at some point, but the new order
makes me not dare adding a Cc... ;-)

Cheers,
Henrik

drivers/hid/hid-ids.h | 6 +++---
drivers/input/mouse/bcm5974.c | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index ffe4c7a..0b7ac21 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -135,9 +135,9 @@
#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS 0x023b
#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ANSI 0x0255
#define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2011_ISO 0x0256
-#define USB_DEVICE_ID_APPLE_WELLSPRING8_ANSI 0x0291
-#define USB_DEVICE_ID_APPLE_WELLSPRING8_ISO 0x0292
-#define USB_DEVICE_ID_APPLE_WELLSPRING8_JIS 0x0293
+#define USB_DEVICE_ID_APPLE_WELLSPRING8_ANSI 0x0290
+#define USB_DEVICE_ID_APPLE_WELLSPRING8_ISO 0x0291
+#define USB_DEVICE_ID_APPLE_WELLSPRING8_JIS 0x0292
#define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY 0x030a
#define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY 0x030b
#define USB_DEVICE_ID_APPLE_IRCONTROL 0x8240
diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c
index 4ef4d5e..a73f961 100644
--- a/drivers/input/mouse/bcm5974.c
+++ b/drivers/input/mouse/bcm5974.c
@@ -89,9 +89,9 @@
#define USB_DEVICE_ID_APPLE_WELLSPRING7A_ISO 0x025a
#define USB_DEVICE_ID_APPLE_WELLSPRING7A_JIS 0x025b
/* MacbookAir6,2 (unibody, June 2013) */
-#define USB_DEVICE_ID_APPLE_WELLSPRING8_ANSI 0x0291
-#define USB_DEVICE_ID_APPLE_WELLSPRING8_ISO 0x0292
-#define USB_DEVICE_ID_APPLE_WELLSPRING8_JIS 0x0293
+#define USB_DEVICE_ID_APPLE_WELLSPRING8_ANSI 0x0290
+#define USB_DEVICE_ID_APPLE_WELLSPRING8_ISO 0x0291
+#define USB_DEVICE_ID_APPLE_WELLSPRING8_JIS 0x0292

#define BCM5974_DEVICE(prod) { \
.match_flags = (USB_DEVICE_ID_MATCH_DEVICE | \
--
1.8.3.4

2013-09-02 11:30:13

by Jiri Kosina

Subject: Re: [PATCH] HID: Correct the USB IDs for the new Macbook Air 6

On Sun, 1 Sep 2013, Henrik Rydberg wrote:

> A recent patch (9d9a04ee) added support for the new machine, but got
> the sequence of USB ids wrong. Reports from both Ian and Linus T show
> that the 0x0291 id is for ISO, not ANSI, which should have the missing
> number 0x0290. This patchs moves the three numbers accordingly, fixing
> the problem.
>
> Cc: Dmitry Torokhov <[email protected]>
> Reported-and-tested-by: Ian Munsie <[email protected]>
> Tested-by: Linus G Thiel <[email protected]>
> Signed-off-by: Henrik Rydberg <[email protected]>
> ---
> Hi Jiri, Dmitry,
>
> it looks like this change has been sufficiently tested now, in
> addition to making perfect sense. Jiri, would you mind taking it, if
> Dmitry approves?

Absolutely ... waiting for Dmitry's Ack.

Thanks,

--
Jiri Kosina
SUSE Labs

2013-09-03 18:04:21

by Dmitry Torokhov

Subject: Re: [PATCH] HID: Correct the USB IDs for the new Macbook Air 6

On Mon, Sep 02, 2013 at 01:30:07PM +0200, Jiri Kosina wrote:
> On Sun, 1 Sep 2013, Henrik Rydberg wrote:
>
> > A recent patch (9d9a04ee) added support for the new machine, but got
> > the sequence of USB ids wrong. Reports from both Ian and Linus T show
> > that the 0x0291 id is for ISO, not ANSI, which should have the missing
> > number 0x0290. This patchs moves the three numbers accordingly, fixing
> > the problem.
> >
> > Cc: Dmitry Torokhov <[email protected]>
> > Reported-and-tested-by: Ian Munsie <[email protected]>
> > Tested-by: Linus G Thiel <[email protected]>
> > Signed-off-by: Henrik Rydberg <[email protected]>
> > ---
> > Hi Jiri, Dmitry,
> >
> > it looks like this change has been sufficiently tested now, in
> > addition to making perfect sense. Jiri, would you mind taking it, if
> > Dmitry approves?
>
> Absolutely ... waiting for Dmitry's Ack.

And here it is:

Acked-by: Dmitry Torokhov <[email protected]>

Thanks.

--
Dmitry

2013-09-04 08:51:23

by Jiri Kosina

Subject: Re: [PATCH] HID: Correct the USB IDs for the new Macbook Air 6

On Tue, 3 Sep 2013, Dmitry Torokhov wrote:

> > > A recent patch (9d9a04ee) added support for the new machine, but got
> > > the sequence of USB ids wrong. Reports from both Ian and Linus T show
> > > that the 0x0291 id is for ISO, not ANSI, which should have the missing
> > > number 0x0290. This patchs moves the three numbers accordingly, fixing
> > > the problem.
> > >
> > > Cc: Dmitry Torokhov <[email protected]>
> > > Reported-and-tested-by: Ian Munsie <[email protected]>
> > > Tested-by: Linus G Thiel <[email protected]>
> > > Signed-off-by: Henrik Rydberg <[email protected]>
> > > ---
> > > Hi Jiri, Dmitry,
> > >
> > > it looks like this change has been sufficiently tested now, in
> > > addition to making perfect sense. Jiri, would you mind taking it, if
> > > Dmitry approves?
> >
> > Absolutely ... waiting for Dmitry's Ack.
>
> And here it is:
>
> Acked-by: Dmitry Torokhov <[email protected]>

Perfect, thanks. Will push it to Linus this merge window.

--
Jiri Kosina
SUSE Labs