aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.10/140-revert_usb_unbind_interfaces.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-10-24 20:39:36 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-10-24 20:39:36 +0000
commit951113224ea6b34413c62aaee700437b55105b14 (patch)
tree0be68d8418752f584e77c1f034904a46bc24f185 /target/linux/generic/patches-3.10/140-revert_usb_unbind_interfaces.patch
parent6ba296a1c9439ca825180e078d1190b2149547cc (diff)
downloadmaster-187ad058-951113224ea6b34413c62aaee700437b55105b14.tar.gz
master-187ad058-951113224ea6b34413c62aaee700437b55105b14.tar.bz2
master-187ad058-951113224ea6b34413c62aaee700437b55105b14.zip
kernel: refresh generic 3.10 patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43050 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.10/140-revert_usb_unbind_interfaces.patch')
-rw-r--r--target/linux/generic/patches-3.10/140-revert_usb_unbind_interfaces.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.10/140-revert_usb_unbind_interfaces.patch b/target/linux/generic/patches-3.10/140-revert_usb_unbind_interfaces.patch
index db1bc1ae19..382a6bdd7d 100644
--- a/target/linux/generic/patches-3.10/140-revert_usb_unbind_interfaces.patch
+++ b/target/linux/generic/patches-3.10/140-revert_usb_unbind_interfaces.patch
@@ -179,7 +179,7 @@ Date: Wed Jul 9 12:08:23 2014 +0200
/* Avoid PM error messages for devices disconnected while suspended
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
-@@ -5263,11 +5263,10 @@ int usb_reset_device(struct usb_device *
+@@ -5334,11 +5334,10 @@ int usb_reset_device(struct usb_device *
else if (cintf->condition ==
USB_INTERFACE_BOUND)
rebind = 1;
@@ -195,7 +195,7 @@ Date: Wed Jul 9 12:08:23 2014 +0200
usb_autosuspend_device(udev);
--- a/drivers/usb/core/usb.h
+++ b/drivers/usb/core/usb.h
-@@ -55,7 +55,7 @@ extern int usb_match_one_id_intf(struct
+@@ -55,7 +55,7 @@ extern int usb_match_one_id_intf(struct
extern int usb_match_device(struct usb_device *dev,
const struct usb_device_id *id);
extern void usb_forced_unbind_intf(struct usb_interface *intf);