summaryrefslogtreecommitdiffstats
path: root/ARM-tegra-usb-no-reset.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-10-08 12:10:10 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-10-08 12:10:33 -0400
commitda99f20f026faababa016afb0c23cc8af405f4ee (patch)
treea3accab6d05f4367a2a50875dab9f6999de2b82e /ARM-tegra-usb-no-reset.patch
parentce8e218a5e0856615ab3d25219fe73a576faa213 (diff)
downloadkernel-da99f20f026faababa016afb0c23cc8af405f4ee.tar.gz
kernel-da99f20f026faababa016afb0c23cc8af405f4ee.tar.xz
kernel-da99f20f026faababa016afb0c23cc8af405f4ee.zip
Linux v3.17-2860-gef0625b70dac
- Reenable debugging options. - Temporarily disable aarch64patches
Diffstat (limited to 'ARM-tegra-usb-no-reset.patch')
-rw-r--r--ARM-tegra-usb-no-reset.patch26
1 files changed, 13 insertions, 13 deletions
diff --git a/ARM-tegra-usb-no-reset.patch b/ARM-tegra-usb-no-reset.patch
index 2f3dd6872..0d4ea9d8f 100644
--- a/ARM-tegra-usb-no-reset.patch
+++ b/ARM-tegra-usb-no-reset.patch
@@ -9,23 +9,23 @@ Patch for disconnect issues with storage attached to a
1 file changed, 7 insertions(+)
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
-index d481c99a20d7..6050143ce7ec 100644
+index 11e80ac31324..15a1c2783b91 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
-@@ -5036,6 +5036,13 @@ static void hub_events(void)
- (u16) hub->change_bits[0],
- (u16) hub->event_bits[0]);
+@@ -5023,6 +5023,13 @@ static void hub_event(struct work_struct *work)
+ (u16) hub->change_bits[0],
+ (u16) hub->event_bits[0]);
-+ /* Don't disconnect USB-SATA on TrimSlice */
-+ if (strcmp(dev_name(hdev->bus->controller), "tegra-ehci.0") == 0) {
-+ if ((hdev->state == 7) && (hub->change_bits[0] == 0) &&
-+ (hub->event_bits[0] == 0x2))
-+ hub->event_bits[0] = 0;
-+ }
++ /* Don't disconnect USB-SATA on TrimSlice */
++ if (strcmp(dev_name(hdev->bus->controller), "tegra-ehci.0") == 0) {
++ if ((hdev->state == 7) && (hub->change_bits[0] == 0) &&
++ (hub->event_bits[0] == 0x2))
++ hub->event_bits[0] = 0;
++ }
+
- /* Lock the device, then check to see if we were
- * disconnected while waiting for the lock to succeed. */
- usb_lock_device(hdev);
+ /* Lock the device, then check to see if we were
+ * disconnected while waiting for the lock to succeed. */
+ usb_lock_device(hdev);
--
1.9.3