summaryrefslogtreecommitdiff
path: root/libre/linux-libre/0010-usb-core-add-power-sequence-handling-for-USB-devices.patch
diff options
context:
space:
mode:
Diffstat (limited to 'libre/linux-libre/0010-usb-core-add-power-sequence-handling-for-USB-devices.patch')
-rw-r--r--libre/linux-libre/0010-usb-core-add-power-sequence-handling-for-USB-devices.patch22
1 files changed, 11 insertions, 11 deletions
diff --git a/libre/linux-libre/0010-usb-core-add-power-sequence-handling-for-USB-devices.patch b/libre/linux-libre/0010-usb-core-add-power-sequence-handling-for-USB-devices.patch
index 77b0f0b46..7b51f8047 100644
--- a/libre/linux-libre/0010-usb-core-add-power-sequence-handling-for-USB-devices.patch
+++ b/libre/linux-libre/0010-usb-core-add-power-sequence-handling-for-USB-devices.patch
@@ -1,4 +1,4 @@
-From 939bdab48c863e3f6ab60b4397a8467e05bc2ace Mon Sep 17 00:00:00 2001
+From 3725bba0f1591b698482f4b144dc311199ef492b Mon Sep 17 00:00:00 2001
From: Peter Chen <peter.chen@nxp.com>
Date: Wed, 21 Jun 2017 14:42:05 +0800
Subject: [PATCH 10/13] usb: core: add power sequence handling for USB devices
@@ -22,12 +22,12 @@ Reviewed-by: Vaibhav Hiremath <hvaibhav.linux@gmail.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
---
drivers/usb/Kconfig | 1 +
- drivers/usb/core/hub.c | 49 +++++++++++++++++++++++++++++++++++++++++++++----
+ drivers/usb/core/hub.c | 49 ++++++++++++++++++++++++++++++++++++++----
drivers/usb/core/hub.h | 1 +
3 files changed, 47 insertions(+), 4 deletions(-)
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
-index 148f3ee70286..575a866422be 100644
+index 987fc5ba6321..bd09fc8ff763 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -45,6 +45,7 @@ config USB
@@ -39,7 +39,7 @@ index 148f3ee70286..575a866422be 100644
---help---
Universal Serial Bus (USB) is a specification for a serial bus
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
-index c5c1f6cf3228..a7de648c3f76 100644
+index aa9968d90a48..14b93b844aaa 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -28,6 +28,7 @@
@@ -50,7 +50,7 @@ index c5c1f6cf3228..a7de648c3f76 100644
#include <linux/uaccess.h>
#include <asm/byteorder.h>
-@@ -1649,6 +1650,7 @@ static void hub_disconnect(struct usb_interface *intf)
+@@ -1654,6 +1655,7 @@ static void hub_disconnect(struct usb_interface *intf)
hub->error = 0;
hub_quiesce(hub, HUB_DISCONNECT);
@@ -58,7 +58,7 @@ index c5c1f6cf3228..a7de648c3f76 100644
mutex_lock(&usb_port_peer_mutex);
/* Avoid races with recursively_mark_NOTATTACHED() */
-@@ -1695,11 +1697,41 @@ static bool hub_descriptor_is_sane(struct usb_host_interface *desc)
+@@ -1700,11 +1702,41 @@ static bool hub_descriptor_is_sane(struct usb_host_interface *desc)
return true;
}
@@ -100,7 +100,7 @@ index c5c1f6cf3228..a7de648c3f76 100644
desc = intf->cur_altsetting;
hdev = interface_to_usbdev(intf);
-@@ -1790,6 +1822,7 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id)
+@@ -1795,6 +1827,7 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id)
INIT_DELAYED_WORK(&hub->leds, led_work);
INIT_DELAYED_WORK(&hub->init_work, NULL);
INIT_WORK(&hub->events, hub_event);
@@ -108,7 +108,7 @@ index c5c1f6cf3228..a7de648c3f76 100644
usb_get_intf(intf);
usb_get_dev(hdev);
-@@ -1803,11 +1836,14 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id)
+@@ -1808,11 +1841,14 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id)
if (id->driver_info & HUB_QUIRK_CHECK_PORT_AUTOSUSPEND)
hub->quirk_check_port_auto_suspend = 1;
@@ -126,7 +126,7 @@ index c5c1f6cf3228..a7de648c3f76 100644
}
static int
-@@ -3621,14 +3657,19 @@ static int hub_suspend(struct usb_interface *intf, pm_message_t msg)
+@@ -3633,14 +3669,19 @@ static int hub_suspend(struct usb_interface *intf, pm_message_t msg)
/* stop hub_wq and related activity */
hub_quiesce(hub, HUB_SUSPEND);
@@ -148,7 +148,7 @@ index c5c1f6cf3228..a7de648c3f76 100644
return 0;
}
diff --git a/drivers/usb/core/hub.h b/drivers/usb/core/hub.h
-index 2a700ccc868c..3a0e6e6b22b0 100644
+index 4dc769ee9c74..b5d5c4818f90 100644
--- a/drivers/usb/core/hub.h
+++ b/drivers/usb/core/hub.h
@@ -70,6 +70,7 @@ struct usb_hub {
@@ -160,5 +160,5 @@ index 2a700ccc868c..3a0e6e6b22b0 100644
/**
--
-2.16.2
+2.17.0