linuxtorvalds / rpms / kernel

Forked from rpms/kernel 2 years ago
Clone
f2c60e
From: Peter Robinson <pbrobinson@gmail.com>
f2c60e
Date: Thu, 3 May 2012 20:27:11 +0100
f2c60e
Subject: [PATCH] ARM: tegra: usb no reset
f2c60e
f2c60e
Patch for disconnect issues with storage attached to a
f2c60e
 tegra-ehci controller
f2c60e
---
f2c60e
 drivers/usb/core/hub.c | 7 +++++++
f2c60e
 1 file changed, 7 insertions(+)
f2c60e
f2c60e
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
f2c60e
index 43cb2f2e3b43..7f838ec11c81 100644
f2c60e
--- a/drivers/usb/core/hub.c
f2c60e
+++ b/drivers/usb/core/hub.c
f2c60e
@@ -4996,6 +4996,13 @@ static void hub_event(struct work_struct *work)
f2c60e
 			(u16) hub->change_bits[0],
f2c60e
 			(u16) hub->event_bits[0]);
f2c60e
 
f2c60e
+	/* Don't disconnect USB-SATA on TrimSlice */
f2c60e
+	if (strcmp(dev_name(hdev->bus->controller), "tegra-ehci.0") == 0) {
f2c60e
+		if ((hdev->state == 7) && (hub->change_bits[0] == 0) &&
f2c60e
+				(hub->event_bits[0] == 0x2))
f2c60e
+			hub->event_bits[0] = 0;
f2c60e
+	}
f2c60e
+
f2c60e
 	/* Lock the device, then check to see if we were
f2c60e
 	 * disconnected while waiting for the lock to succeed. */
f2c60e
 	usb_lock_device(hdev);