diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-27 05:55:52 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-27 05:55:52 +0200 |
commit | f7ba01a9677fffa21535bc6cdcad930a858d6106 (patch) | |
tree | 6eb6df39221f8926b813d63b41ffed9da18e6a5d /0001-ARM-tegra-usb-no-reset.patch | |
parent | 837cd03f031f1daaa2dda23d584cda25b0dfd51e (diff) | |
parent | 6c2cc50051831fa502a8b082a312ca90e7039f3f (diff) | |
download | kernel-f7ba01a9677fffa21535bc6cdcad930a858d6106.tar.gz kernel-f7ba01a9677fffa21535bc6cdcad930a858d6106.tar.xz kernel-f7ba01a9677fffa21535bc6cdcad930a858d6106.zip |
merge masterkernel-5.7.0-0.rc3.1.vanilla.1.fc33kernel-5.7.0-0.rc3.1.vanilla.1.fc32kernel-5.7.0-0.rc3.1.vanilla.1.fc31kernel-5.7.0-0.rc3.1.vanilla.1.fc30
Diffstat (limited to '0001-ARM-tegra-usb-no-reset.patch')
-rw-r--r-- | 0001-ARM-tegra-usb-no-reset.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/0001-ARM-tegra-usb-no-reset.patch b/0001-ARM-tegra-usb-no-reset.patch index 1d9e3483f..4aae5419e 100644 --- a/0001-ARM-tegra-usb-no-reset.patch +++ b/0001-ARM-tegra-usb-no-reset.patch @@ -1,4 +1,4 @@ -From 9d2e00927220900c925185269639568d5293685c Mon Sep 17 00:00:00 2001 +From d62163bd305a7388eb820f618bc7cf575f6982bb Mon Sep 17 00:00:00 2001 From: Peter Robinson <pbrobinson@gmail.com> Date: Thu, 3 May 2012 20:27:11 +0100 Subject: [PATCH] ARM: tegra: usb no reset @@ -10,13 +10,13 @@ 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 54cd8ef795ec..4afeea51b2c9 100644 +index 2b6565c06c23..2bbf3e341b47 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -5504,6 +5504,13 @@ static void hub_event(struct work_struct *work) +@@ -5516,6 +5516,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) && @@ -28,5 +28,5 @@ index 54cd8ef795ec..4afeea51b2c9 100644 * disconnected while waiting for the lock to succeed. */ usb_lock_device(hdev); -- -2.26.0 +2.26.2 |