diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-23 18:24:55 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-23 18:24:55 -0400 |
| commit | c0bf5ad0c444dedb42d08c0e1e334f35b657c96f (patch) | |
| tree | 7b341ba59d1716c27420ff6dd086097827ad007e | |
| parent | 5b00d82c3f3be886cd824268b7b7a8af46981d4b (diff) | |
| download | longterm-queue-4.12-c0bf5ad0c444dedb42d08c0e1e334f35b657c96f.tar.gz | |
bt: drop ID patch n/a for 4.12
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/Bluetooth-btusb-Add-new-NFA344A-entry.patch | 55 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 0 insertions, 56 deletions
diff --git a/queue/Bluetooth-btusb-Add-new-NFA344A-entry.patch b/queue/Bluetooth-btusb-Add-new-NFA344A-entry.patch deleted file mode 100644 index 9ffe6af..0000000 --- a/queue/Bluetooth-btusb-Add-new-NFA344A-entry.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 858ff38af77fc660092e82474ecc6ac135ed29fe Mon Sep 17 00:00:00 2001 -From: Bartosz Chronowski <ext.bartosz.chronowski@tieto.com> -Date: Thu, 26 Oct 2017 10:22:43 +0200 -Subject: [PATCH] Bluetooth: btusb: Add new NFA344A entry. - -commit 858ff38af77fc660092e82474ecc6ac135ed29fe upstream. - -This change allows proper low power mode entry in suspend. - -/sys/kernel/debug/usb/devices entry: -T: Bus=01 Lev=01 Prnt=01 Port=05 Cnt=03 Dev#= 3 Spd=12 MxCh= 0 -D: Ver= 2.01 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 -P: Vendor=0489 ProdID=e09f Rev= 0.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 -E: Ad=81(I) Atr=03(Int.) MxPS= 16 Ivl=1ms -E: Ad=82(I) Atr=02(Bulk) MxPS= 64 Ivl=0ms -E: Ad=02(O) Atr=02(Bulk) MxPS= 64 Ivl=0ms -I:* If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb -E: Ad=83(I) Atr=01(Isoc) MxPS= 0 Ivl=1ms -E: Ad=03(O) Atr=01(Isoc) MxPS= 0 Ivl=1ms -I: If#= 1 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb -E: Ad=83(I) Atr=01(Isoc) MxPS= 9 Ivl=1ms -E: Ad=03(O) Atr=01(Isoc) MxPS= 9 Ivl=1ms -I: If#= 1 Alt= 2 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb -E: Ad=83(I) Atr=01(Isoc) MxPS= 17 Ivl=1ms -E: Ad=03(O) Atr=01(Isoc) MxPS= 17 Ivl=1ms -I: If#= 1 Alt= 3 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb -E: Ad=83(I) Atr=01(Isoc) MxPS= 25 Ivl=1ms -E: Ad=03(O) Atr=01(Isoc) MxPS= 25 Ivl=1ms -I: If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb -E: Ad=83(I) Atr=01(Isoc) MxPS= 33 Ivl=1ms -E: Ad=03(O) Atr=01(Isoc) MxPS= 33 Ivl=1ms -I: If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb -E: Ad=83(I) Atr=01(Isoc) MxPS= 49 Ivl=1ms -E: Ad=03(O) Atr=01(Isoc) MxPS= 49 Ivl=1ms - -Signed-off-by: Bartosz Chronowski <ext.bartosz.chronowski@tieto.com> -Signed-off-by: Marcel Holtmann <marcel@holtmann.org> - -diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c -index c054d7bce490..b8eb39436ef2 100644 ---- a/drivers/bluetooth/btusb.c -+++ b/drivers/bluetooth/btusb.c -@@ -267,6 +267,7 @@ static const struct usb_device_id blacklist_table[] = { - { USB_DEVICE(0x0cf3, 0xe301), .driver_info = BTUSB_QCA_ROME }, - { USB_DEVICE(0x0cf3, 0xe360), .driver_info = BTUSB_QCA_ROME }, - { USB_DEVICE(0x0489, 0xe092), .driver_info = BTUSB_QCA_ROME }, -+ { USB_DEVICE(0x0489, 0xe09f), .driver_info = BTUSB_QCA_ROME }, - { USB_DEVICE(0x0489, 0xe0a2), .driver_info = BTUSB_QCA_ROME }, - { USB_DEVICE(0x04ca, 0x3011), .driver_info = BTUSB_QCA_ROME }, - { USB_DEVICE(0x04ca, 0x3016), .driver_info = BTUSB_QCA_ROME }, --- -2.15.0 - diff --git a/queue/series b/queue/series index 11b00ea..866e272 100644 --- a/queue/series +++ b/queue/series @@ -74,7 +74,6 @@ btrfs-avoid-null-pointer-dereference-on-fs_info-when.patch btrfs-tests-Fix-a-memory-leak-in-error-handling-path.patch mtd-spi-nor-stm32-quadspi-Fix-uninitialized-error-re.patch ARM64-dts-meson-gxbb-odroidc2-fix-usb1-power-supply.patch -Bluetooth-btusb-Add-new-NFA344A-entry.patch samples-bpf-adjust-rlimit-RLIMIT_MEMLOCK-for-xdp1.patch liquidio-fix-kernel-panic-in-VF-driver.patch platform-x86-hp_accel-Add-quirk-for-HP-ProBook-440-G.patch |