From: Greg Kroah-Hartman Date: Sun, 10 Apr 2016 01:04:57 +0000 (-0700) Subject: 3.14-stable patches X-Git-Tag: v4.5.1~22 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7a09be29aca0e7e348089ab7e04a85b7f63a033a;p=thirdparty%2Fkernel%2Fstable-queue.git 3.14-stable patches added patches: bluetooth-add-new-ar3012-id-0489-e095.patch --- diff --git a/queue-3.14/bluetooth-add-new-ar3012-id-0489-e095.patch b/queue-3.14/bluetooth-add-new-ar3012-id-0489-e095.patch new file mode 100644 index 00000000000..1c49daf910c --- /dev/null +++ b/queue-3.14/bluetooth-add-new-ar3012-id-0489-e095.patch @@ -0,0 +1,59 @@ +From 28c971d82fb58ef7cba22e5308be6d2d2590473d Mon Sep 17 00:00:00 2001 +From: Dmitry Tunin +Date: Wed, 10 Feb 2016 00:49:11 +0300 +Subject: Bluetooth: Add new AR3012 ID 0489:e095 + +From: Dmitry Tunin + +commit 28c971d82fb58ef7cba22e5308be6d2d2590473d upstream. + +T: Bus=01 Lev=01 Prnt=01 Port=04 Cnt=02 Dev#= 3 Spd=12 MxCh= 0 +D: Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs= 1 +P: Vendor=0489 ProdID=e095 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 + +This device requires ar3k/AthrBT_0x31010100.dfu and +ar3k/ramps_0x31010100_40.dfu firmware files that are not in +linux-firmware yet. + +BugLink: https://bugs.launchpad.net/bugs/1542944 + +Signed-off-by: Dmitry Tunin +Signed-off-by: Marcel Holtmann +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/bluetooth/ath3k.c | 2 ++ + drivers/bluetooth/btusb.c | 1 + + 2 files changed, 3 insertions(+) + +--- a/drivers/bluetooth/ath3k.c ++++ b/drivers/bluetooth/ath3k.c +@@ -81,6 +81,7 @@ static const struct usb_device_id ath3k_ + { USB_DEVICE(0x0489, 0xe05f) }, + { USB_DEVICE(0x0489, 0xe076) }, + { USB_DEVICE(0x0489, 0xe078) }, ++ { USB_DEVICE(0x0489, 0xe095) }, + { USB_DEVICE(0x04c5, 0x1330) }, + { USB_DEVICE(0x04CA, 0x3004) }, + { USB_DEVICE(0x04CA, 0x3005) }, +@@ -142,6 +143,7 @@ static const struct usb_device_id ath3k_ + { USB_DEVICE(0x0489, 0xe05f), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x0489, 0xe076), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x0489, 0xe078), .driver_info = BTUSB_ATH3012 }, ++ { USB_DEVICE(0x0489, 0xe095), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x04c5, 0x1330), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 }, +--- a/drivers/bluetooth/btusb.c ++++ b/drivers/bluetooth/btusb.c +@@ -159,6 +159,7 @@ static const struct usb_device_id blackl + { USB_DEVICE(0x0489, 0xe05f), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x0489, 0xe076), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x0489, 0xe078), .driver_info = BTUSB_ATH3012 }, ++ { USB_DEVICE(0x0489, 0xe095), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x04c5, 0x1330), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 }, + { USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 }, diff --git a/queue-3.14/series b/queue-3.14/series index 8f7e58f5f5b..46c44867ca6 100644 --- a/queue-3.14/series +++ b/queue-3.14/series @@ -47,3 +47,4 @@ alsa-hda-fix-unconditional-gpio-toggle-via-automute.patch jbd2-fix-fs-corruption-possibility-in-jbd2_journal_destroy-on-umount-path.patch bcache-fix-cache_set_flush-null-pointer-dereference-on-oom.patch watchdog-rc32434_wdt-fix-ioctl-error-handling.patch +bluetooth-add-new-ar3012-id-0489-e095.patch