aboutsummaryrefslogtreecommitdiffstats
path: root/usb
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2008-07-14 21:29:06 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2008-07-14 21:29:06 -0700
commit9e35477be4b3d7f36f8229ae3ff173dfa8062f9d (patch)
tree516ebd58e219b7450c9a3545e9ed7bb9e578635e /usb
parent01c2f2a5a80ab32db41d129f3be6932a29353fd6 (diff)
downloadpatches-9e35477be4b3d7f36f8229ae3ff173dfa8062f9d.tar.gz
fix merge error in usb hub patch
Diffstat (limited to 'usb')
-rw-r--r--usb/usb-fix-usb_reset_device-and-usb_reset_composite_device.patch10
-rw-r--r--usb/usb-force-unbinding-of-drivers-lacking-reset_resume-or-other-methods.patch6
-rw-r--r--usb/usb-remove-interface-parameter-of-usb_reset_composite_device.patch6
-rw-r--r--usb/usb-simplify-hub_restart-logic.patch13
4 files changed, 22 insertions, 13 deletions
diff --git a/usb/usb-fix-usb_reset_device-and-usb_reset_composite_device.patch b/usb/usb-fix-usb_reset_device-and-usb_reset_composite_device.patch
index 4160fbd753106b..fc9b17224c1929 100644
--- a/usb/usb-fix-usb_reset_device-and-usb_reset_composite_device.patch
+++ b/usb/usb-fix-usb_reset_device-and-usb_reset_composite_device.patch
@@ -130,7 +130,7 @@ Signed-off-by: Ming Lei <tom.leiming@gmail.com>
if (ret) {
dev_dbg (hub_dev,
"error resetting hub: %d\n", ret);
-@@ -3235,12 +3237,12 @@ static int descriptors_changed(struct us
+@@ -3233,12 +3235,12 @@ static int descriptors_changed(struct us
}
/**
@@ -145,7 +145,7 @@ Signed-off-by: Ming Lei <tom.leiming@gmail.com>
*
* Do a port reset, reassign the device's address, and establish its
* former operating configuration. If the reset fails, or the device's
-@@ -3264,7 +3266,7 @@ static int descriptors_changed(struct us
+@@ -3262,7 +3264,7 @@ static int descriptors_changed(struct us
* holding the device lock because these tasks should always call
* usb_autopm_resume_device(), thereby preventing any unwanted autoresume.
*/
@@ -154,7 +154,7 @@ Signed-off-by: Ming Lei <tom.leiming@gmail.com>
{
struct usb_device *parent_hdev = udev->parent;
struct usb_hub *parent_hub;
-@@ -3352,24 +3354,23 @@ re_enumerate:
+@@ -3350,24 +3352,23 @@ re_enumerate:
hub_port_logical_disconnect(parent_hub, port1);
return -ENODEV;
}
@@ -182,7 +182,7 @@ Signed-off-by: Ming Lei <tom.leiming@gmail.com>
{
int ret;
int i;
-@@ -3399,7 +3400,7 @@ int usb_reset_composite_device(struct us
+@@ -3397,7 +3398,7 @@ int usb_reset_composite_device(struct us
}
}
@@ -191,7 +191,7 @@ Signed-off-by: Ming Lei <tom.leiming@gmail.com>
if (config) {
for (i = config->desc.bNumInterfaces - 1; i >= 0; --i) {
-@@ -3418,4 +3419,4 @@ int usb_reset_composite_device(struct us
+@@ -3416,4 +3417,4 @@ int usb_reset_composite_device(struct us
usb_autosuspend_device(udev);
return ret;
}
diff --git a/usb/usb-force-unbinding-of-drivers-lacking-reset_resume-or-other-methods.patch b/usb/usb-force-unbinding-of-drivers-lacking-reset_resume-or-other-methods.patch
index 644986a6da4834..40a43d8c1114a3 100644
--- a/usb/usb-force-unbinding-of-drivers-lacking-reset_resume-or-other-methods.patch
+++ b/usb/usb-force-unbinding-of-drivers-lacking-reset_resume-or-other-methods.patch
@@ -241,7 +241,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* it again. */
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
-@@ -3369,6 +3369,11 @@ re_enumerate:
+@@ -3367,6 +3367,11 @@ re_enumerate:
* this from a driver probe() routine after downloading new firmware.
* For calls that might not occur during probe(), drivers should lock
* the device using usb_lock_device_for_reset().
@@ -253,7 +253,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
*/
int usb_reset_device(struct usb_device *udev)
{
-@@ -3390,12 +3395,17 @@ int usb_reset_device(struct usb_device *
+@@ -3388,12 +3393,17 @@ int usb_reset_device(struct usb_device *
for (i = 0; i < config->desc.bNumInterfaces; ++i) {
struct usb_interface *cintf = config->interface[i];
struct usb_driver *drv;
@@ -274,7 +274,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
}
}
}
-@@ -3406,13 +3416,18 @@ int usb_reset_device(struct usb_device *
+@@ -3404,13 +3414,18 @@ int usb_reset_device(struct usb_device *
for (i = config->desc.bNumInterfaces - 1; i >= 0; --i) {
struct usb_interface *cintf = config->interface[i];
struct usb_driver *drv;
diff --git a/usb/usb-remove-interface-parameter-of-usb_reset_composite_device.patch b/usb/usb-remove-interface-parameter-of-usb_reset_composite_device.patch
index 2d151840e060ed..2fda36e301a2fc 100644
--- a/usb/usb-remove-interface-parameter-of-usb_reset_composite_device.patch
+++ b/usb/usb-remove-interface-parameter-of-usb_reset_composite_device.patch
@@ -69,7 +69,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
if (ret) {
dev_dbg (hub_dev,
"error resetting hub: %d\n", ret);
-@@ -3357,7 +3357,6 @@ EXPORT_SYMBOL_GPL(usb_reset_device);
+@@ -3355,7 +3355,6 @@ EXPORT_SYMBOL_GPL(usb_reset_device);
/**
* usb_reset_composite_device - warn interface drivers and perform a USB port reset
* @udev: device to reset (not in SUSPENDED or NOTATTACHED state)
@@ -77,7 +77,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
*
* Warns all drivers bound to registered interfaces (using their pre_reset
* method), performs the port reset, and then lets the drivers know that
-@@ -3370,8 +3369,7 @@ EXPORT_SYMBOL_GPL(usb_reset_device);
+@@ -3368,8 +3367,7 @@ EXPORT_SYMBOL_GPL(usb_reset_device);
* For calls that might not occur during probe(), drivers should lock
* the device using usb_lock_device_for_reset().
*/
@@ -87,7 +87,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
{
int ret;
int i;
-@@ -3387,9 +3385,6 @@ int usb_reset_composite_device(struct us
+@@ -3385,9 +3383,6 @@ int usb_reset_composite_device(struct us
/* Prevent autosuspend during the reset */
usb_autoresume_device(udev);
diff --git a/usb/usb-simplify-hub_restart-logic.patch b/usb/usb-simplify-hub_restart-logic.patch
index 2bc641afa0758e..adcc78db569e02 100644
--- a/usb/usb-simplify-hub_restart-logic.patch
+++ b/usb/usb-simplify-hub_restart-logic.patch
@@ -28,8 +28,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/usb/core/driver.c | 7 --
- drivers/usb/core/hub.c | 110 +++++++++++++++++++++-------------------------
- 2 files changed, 53 insertions(+), 64 deletions(-)
+ drivers/usb/core/hub.c | 112 +++++++++++++++++++++-------------------------
+ 2 files changed, 53 insertions(+), 66 deletions(-)
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -243,3 +243,12 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
if (portchange & USB_PORT_STAT_C_CONNECTION) {
clear_port_feature(hdev, i,
USB_PORT_FEAT_C_CONNECTION);
+@@ -3011,8 +3005,6 @@ static void hub_events(void)
+ }
+ }
+
+- hub->activating = 0;
+-
+ /* If this is a root hub, tell the HCD it's okay to
+ * re-enable port-change interrupts now. */
+ if (!hdev->parent && !hub->busy_bits[0])
generated by cgit 1.2.3-korg (git 2.43.0) at 2026-03-01 20:02:47 +0000