| Message ID | 1344480324-24430-1-git-send-email-ming.lei@canonical.com |
|---|---|
| State | New |
| Headers | show |
On Thu, Aug 09, 2012 at 10:45:24AM +0800, Ming Lei wrote: > From: Benjamin Tissoires <benjamin.tissoires@enac.fr> > > SRU Justification: > > Impact: > - without the patch, touchpad(1cb6:6651) can't be used on Precise > Fix: > - After applying the patch, touchpad(1cb6:6651) can be used on Precise > > BugLink: http://bugs.launchpad.net/bugs/1026174 This appears to be a direct cherry-pick from the commit below, you should cherry-pick -x the commit to get the upstream commit id in the patch. commit 71078b0deba8420e00b0c5e39ea359dbcaa11114 Author: Benjamin Tissoires <benjamin.tissoires@enac.fr> Date: Tue Mar 6 10:53:46 2012 +0100 HID: multitouch: add new PID from Ideacom The SRU justification also should go into the BUG for the SRU team. With the upstream commit id added: Acked-by: Andy Whitcroft <apw@canonical.com> > Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr> > Acked-by: Henrik Rydberg <rydberg@euromail.se> > Signed-off-by: Jiri Kosina <jkosina@suse.cz> > Signed-off-by: Ming Lei <ming.lei@canonical.com> > --- > drivers/hid/hid-ids.h | 1 + > drivers/hid/hid-multitouch.c | 3 +++ > 2 files changed, 4 insertions(+) > > diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h > index 5cb1d63..10a9ca9 100644 > --- a/drivers/hid/hid-ids.h > +++ b/drivers/hid/hid-ids.h > @@ -375,6 +375,7 @@ > > #define USB_VENDOR_ID_IDEACOM 0x1cb6 > #define USB_DEVICE_ID_IDEACOM_IDC6650 0x6650 > +#define USB_DEVICE_ID_IDEACOM_IDC6651 0x6651 > > #define USB_VENDOR_ID_ILITEK 0x222a > #define USB_DEVICE_ID_ILITEK_MULTITOUCH 0x0001 > diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c > index 03990a8..c7ee035 100644 > --- a/drivers/hid/hid-multitouch.c > +++ b/drivers/hid/hid-multitouch.c > @@ -828,6 +828,9 @@ static const struct hid_device_id mt_devices[] = { > { .driver_data = MT_CLS_SERIAL, > HID_USB_DEVICE(USB_VENDOR_ID_IDEACOM, > USB_DEVICE_ID_IDEACOM_IDC6650) }, > + { .driver_data = MT_CLS_SERIAL, > + HID_USB_DEVICE(USB_VENDOR_ID_IDEACOM, > + USB_DEVICE_ID_IDEACOM_IDC6651) }, > > /* Ilitek dual touch panel */ > { .driver_data = MT_CLS_DEFAULT, > -- -apw
On Thu, Aug 09, 2012 at 10:45:24AM +0800, Ming Lei wrote: > From: Benjamin Tissoires <benjamin.tissoires@enac.fr> > > SRU Justification: > > Impact: > - without the patch, touchpad(1cb6:6651) can't be used on Precise > Fix: > - After applying the patch, touchpad(1cb6:6651) can be used on Precise > > BugLink: http://bugs.launchpad.net/bugs/1026174 > Ack, but with same considerations as apw did, should be a straight cherry-pick -x with BugLink.
On Thu, Aug 9, 2012 at 9:41 PM, Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com> wrote: > On Thu, Aug 09, 2012 at 10:45:24AM +0800, Ming Lei wrote: >> From: Benjamin Tissoires <benjamin.tissoires@enac.fr> >> >> SRU Justification: >> >> Impact: >> - without the patch, touchpad(1cb6:6651) can't be used on Precise >> Fix: >> - After applying the patch, touchpad(1cb6:6651) can be used on Precise >> >> BugLink: http://bugs.launchpad.net/bugs/1026174 >> > > Ack, but with same considerations as apw did, should be a straight > cherry-pick -x with BugLink. Looks this one has not been merged to precise, will you cherry pick it? Or need me to resend this one? Thanks, -- Ming Lei
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 5cb1d63..10a9ca9 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -375,6 +375,7 @@ #define USB_VENDOR_ID_IDEACOM 0x1cb6 #define USB_DEVICE_ID_IDEACOM_IDC6650 0x6650 +#define USB_DEVICE_ID_IDEACOM_IDC6651 0x6651 #define USB_VENDOR_ID_ILITEK 0x222a #define USB_DEVICE_ID_ILITEK_MULTITOUCH 0x0001 diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index 03990a8..c7ee035 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c @@ -828,6 +828,9 @@ static const struct hid_device_id mt_devices[] = { { .driver_data = MT_CLS_SERIAL, HID_USB_DEVICE(USB_VENDOR_ID_IDEACOM, USB_DEVICE_ID_IDEACOM_IDC6650) }, + { .driver_data = MT_CLS_SERIAL, + HID_USB_DEVICE(USB_VENDOR_ID_IDEACOM, + USB_DEVICE_ID_IDEACOM_IDC6651) }, /* Ilitek dual touch panel */ { .driver_data = MT_CLS_DEFAULT,