Message ID | 1479198437-3072-2-git-send-email-phidias.chiang@canonical.com |
---|---|
State | New |
Headers | show |
On 15.11.2016 09:27, Phidias Chiang wrote: > From: Kai-Heng Feng <kaihengfeng@gmail.com> > > BugLink: http://bugs.launchpad.net/bugs/1641562 > > Device 0cf3:e009 is one of the QCA ROME family. > > T: Bus=01 Lev=01 Prnt=01 Port=07 Cnt=04 Dev#= 4 Spd=12 MxCh= 0 > D: Ver= 2.01 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 > P: Vendor=0cf3 ProdID=e009 Rev=00.01 > C: #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA > I: If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb > I: If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb > > Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> > Signed-off-by: Marcel Holtmann <marcel@holtmann.org> > (cherry picked from commit 935199348048902124d0b288788c3a45e78b69ab) Actually one minor note, the xenial and yakkety version of the patch are different by one additional line. So strictly speaking, one of them is not a clean cherry-pick. So it might be less confusing if the Xenial version said backported (might mention minor context adjustment) or it might be possible to apply to original patch with "git am -C<2?>" then I'd submit the original patch and mention in the cover that Xenial needs to apply it that special way. > Signed-off-by: Phidias Chiang <phidias.chiang@canonical.com> > --- > drivers/bluetooth/btusb.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c > index 811f9b9..cc9e549 100644 > --- a/drivers/bluetooth/btusb.c > +++ b/drivers/bluetooth/btusb.c > @@ -248,6 +248,7 @@ static const struct usb_device_id blacklist_table[] = { > > /* QCA ROME chipset */ > { USB_DEVICE(0x0cf3, 0xe007), .driver_info = BTUSB_QCA_ROME }, > + { USB_DEVICE(0x0cf3, 0xe009), .driver_info = BTUSB_QCA_ROME }, > { USB_DEVICE(0x0cf3, 0xe300), .driver_info = BTUSB_QCA_ROME }, > { USB_DEVICE(0x0cf3, 0xe360), .driver_info = BTUSB_QCA_ROME }, > { USB_DEVICE(0x0489, 0xe092), .driver_info = BTUSB_QCA_ROME }, >
On Tue, Nov 15, 2016 at 04:27:17PM +0800, Phidias Chiang wrote: > From: Kai-Heng Feng <kaihengfeng@gmail.com> > > BugLink: http://bugs.launchpad.net/bugs/1641562 > > Device 0cf3:e009 is one of the QCA ROME family. > > T: Bus=01 Lev=01 Prnt=01 Port=07 Cnt=04 Dev#= 4 Spd=12 MxCh= 0 > D: Ver= 2.01 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 > P: Vendor=0cf3 ProdID=e009 Rev=00.01 > C: #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=100mA > I: If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb > I: If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb > > Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com> > Signed-off-by: Marcel Holtmann <marcel@holtmann.org> > (cherry picked from commit 935199348048902124d0b288788c3a45e78b69ab) > Signed-off-by: Phidias Chiang <phidias.chiang@canonical.com> I'm not seeing where this differs from V1 ...
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 811f9b9..cc9e549 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -248,6 +248,7 @@ static const struct usb_device_id blacklist_table[] = { /* QCA ROME chipset */ { USB_DEVICE(0x0cf3, 0xe007), .driver_info = BTUSB_QCA_ROME }, + { USB_DEVICE(0x0cf3, 0xe009), .driver_info = BTUSB_QCA_ROME }, { USB_DEVICE(0x0cf3, 0xe300), .driver_info = BTUSB_QCA_ROME }, { USB_DEVICE(0x0cf3, 0xe360), .driver_info = BTUSB_QCA_ROME }, { USB_DEVICE(0x0489, 0xe092), .driver_info = BTUSB_QCA_ROME },