Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2016-06-13 15:10:04 +0200
committerTakashi Iwai <tiwai@suse.de>2016-06-13 15:10:04 +0200
commita8a2b3d59c5842ded2b73ef895415ce24b5151eb (patch)
tree853b8a4d71fa628e5eea81d5a1a4f3e13231e23f
parent16c919db0daf0438fbfaf6dbd76a934de0b42c2f (diff)
parent0f5e3fbe443e1c1d7d222c01e4df34794d3b1f26 (diff)
Merge branch 'users/oneukum/SLE12-SP2/for-next' into SLE12-SP2
Pull Intel BT fix from Oliver Neukum.
-rw-r--r--patches.suse/0001-usb-quirk-to-stop-runtime-PM-for-Intel-7260.patch34
-rw-r--r--series.conf1
2 files changed, 35 insertions, 0 deletions
diff --git a/patches.suse/0001-usb-quirk-to-stop-runtime-PM-for-Intel-7260.patch b/patches.suse/0001-usb-quirk-to-stop-runtime-PM-for-Intel-7260.patch
new file mode 100644
index 0000000000..721b63438b
--- /dev/null
+++ b/patches.suse/0001-usb-quirk-to-stop-runtime-PM-for-Intel-7260.patch
@@ -0,0 +1,34 @@
+From 93db038ab4c4a8119d23f824aeeeb99796be8247 Mon Sep 17 00:00:00 2001
+From: Oliver Neukum <oneukum@suse.com>
+Date: Mon, 13 Jun 2016 14:23:04 +0200
+Subject: [PATCH] usb: quirk to stop runtime PM for Intel 7260
+References: bnc#984446
+Patch-Mainline: Never (upstream fixed this in firmware which we can't take)
+
+The old firmware in the Intel 7260 BT modules is prone to crashes
+if runtime power management is used. Our driver is too old to use
+the newest firmware. Hence runtime PM is to be disabled for this
+module.
+
+Signed-off-by: Oliver Neukum <oneukum@suse.com>
+---
+ drivers/usb/core/quirks.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
+index 6dc810b..3a0f9b6 100644
+--- a/drivers/usb/core/quirks.c
++++ b/drivers/usb/core/quirks.c
+@@ -208,6 +208,9 @@ static const struct usb_device_id usb_quirk_list[] = {
+ /* Blackmagic Design UltraStudio SDI */
+ { USB_DEVICE(0x1edb, 0xbd4f), .driver_info = USB_QUIRK_NO_LPM },
+
++ /* Intel 7260 BT - with the old firmware, but we cannot update */
++ { USB_DEVICE(0x8087, 0x07dc), .driver_info = USB_QUIRK_RESET_RESUME },
++
+ { } /* terminating entry must be last */
+ };
+
+--
+2.1.4
+
diff --git a/series.conf b/series.conf
index e9e5ec7ef0..162ee4698d 100644
--- a/series.conf
+++ b/series.conf
@@ -4150,6 +4150,7 @@
patches.drivers/0001-usb-core-hub-hub_port_init-lock-controller-instead-o.patch
patches.drivers/0001-USB-usbfs-fix-potential-infoleak-in-devio.patch
patches.drivers/0001-media-usbvision-revert-commit-588afcc1.patch
+ patches.suse/0001-usb-quirk-to-stop-runtime-PM-for-Intel-7260.patch
########################################################
# I2C