diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-15 06:23:20 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-15 06:23:20 +0200 |
commit | 5403e7c67e6625df392da2438d02c70442fd1952 (patch) | |
tree | 988c327386789b1b9fefe7ba1cebed2c7a387b32 /ARM-tegra-usb-no-reset.patch | |
parent | b1e22a960e2a6f39797e7d2022994df2176ad1e9 (diff) | |
parent | 0310b312a7e5dffcdf24ae835ed732f7a6a9c471 (diff) | |
download | kernel-5403e7c67e6625df392da2438d02c70442fd1952.tar.gz kernel-5403e7c67e6625df392da2438d02c70442fd1952.tar.xz kernel-5403e7c67e6625df392da2438d02c70442fd1952.zip |
blindly merge master, no adjustments to the new world order yet
Diffstat (limited to 'ARM-tegra-usb-no-reset.patch')
-rw-r--r-- | ARM-tegra-usb-no-reset.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/ARM-tegra-usb-no-reset.patch b/ARM-tegra-usb-no-reset.patch deleted file mode 100644 index 8ea4f5174..000000000 --- a/ARM-tegra-usb-no-reset.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Peter Robinson <pbrobinson@gmail.com> -Date: Thu, 3 May 2012 20:27:11 +0100 -Subject: [PATCH] ARM: tegra: usb no reset - -Patch for disconnect issues with storage attached to a - tegra-ehci controller ---- - drivers/usb/core/hub.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index 43cb2f2e3b43..7f838ec11c81 100644 ---- a/drivers/usb/core/hub.c -+++ b/drivers/usb/core/hub.c -@@ -4996,6 +4996,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; -+ } -+ - /* Lock the device, then check to see if we were - * disconnected while waiting for the lock to succeed. */ - usb_lock_device(hdev); |