lkml.org 
[lkml]   [2012]   [Apr]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [ 032/149] USB: qcserial: add several new serial devices
On Sun, Apr 01, 2012 at 05:00:15PM +0100, Ben Hutchings wrote:
> On Fri, 2012-03-30 at 12:49 -0700, Greg KH wrote:
> > 3.2-stable review patch. If anyone has any objections, please let me know.
> >
> > ------------------
> >
> > From: Thomas Tuttle <ttuttle@chromium.org>
> >
> > commit 2db4d87070e87d198ab630e66a898b45eff316d9 upstream.
> >
> > Signed-off-by: Thomas Tuttle <ttuttle@chromium.org>
> > Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
> >
> > ---
> > drivers/usb/serial/qcserial.c | 14 ++++++++++++++
> > 1 file changed, 14 insertions(+)
> >
> > --- a/drivers/usb/serial/qcserial.c
> > +++ b/drivers/usb/serial/qcserial.c
> > @@ -36,6 +36,11 @@ static const struct usb_device_id id_tab
> > {USB_DEVICE(0x413c, 0x8171)}, /* Dell Gobi QDL device */
> > {USB_DEVICE(0x1410, 0xa001)}, /* Novatel Gobi Modem device */
> > {USB_DEVICE(0x1410, 0xa008)}, /* Novatel Gobi QDL device */
> > + {USB_DEVICE(0x1410, 0xa010)}, /* Novatel Gobi QDL device */
> [...]
>
> This one is already claimed by option as:
>
> { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_G2) }
>
> Seems there's some confusion here...

Yes, but that's what is in Linus's tree right now, right?

One of them should be removed, but I don't know which one :(

thanks,

greg k-h


\
 
 \ /
  Last update: 2012-04-02 18:27    [W:0.096 / U:8.528 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site