diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-07-01 12:49:23 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-07-01 12:49:23 -0700 |
| commit | 6ec0a617c413c6f6c7233f179b637a7795231e52 (patch) | |
| tree | 6771d4062ba858f8d5754dab1cd1dc93c6c44a79 /usb | |
| parent | 7e3b6b077b64932ea314ec12435d535b15457e08 (diff) | |
| download | patches-6ec0a617c413c6f6c7233f179b637a7795231e52.tar.gz | |
more usb patches
Diffstat (limited to 'usb')
| -rw-r--r-- | usb/usb-make-bus_id-const-in-struct-usb_bus.patch | 2 | ||||
| -rw-r--r-- | usb/usb-revert-don-t-lose-disconnections-during-suspend.patch | 43 |
2 files changed, 44 insertions, 1 deletions
diff --git a/usb/usb-make-bus_id-const-in-struct-usb_bus.patch b/usb/usb-make-bus_id-const-in-struct-usb_bus.patch index a6cf95f2a92ba5..0b82361ef6c536 100644 --- a/usb/usb-make-bus_id-const-in-struct-usb_bus.patch +++ b/usb/usb-make-bus_id-const-in-struct-usb_bus.patch @@ -17,7 +17,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c -@@ -1744,7 +1744,7 @@ EXPORT_SYMBOL_GPL (usb_hc_died); +@@ -1755,7 +1755,7 @@ EXPORT_SYMBOL_GPL (usb_hc_died); * If memory is unavailable, returns NULL. */ struct usb_hcd *usb_create_hcd (const struct hc_driver *driver, diff --git a/usb/usb-revert-don-t-lose-disconnections-during-suspend.patch b/usb/usb-revert-don-t-lose-disconnections-during-suspend.patch new file mode 100644 index 00000000000000..236a4968d328ce --- /dev/null +++ b/usb/usb-revert-don-t-lose-disconnections-during-suspend.patch @@ -0,0 +1,43 @@ +From foo@baz Tue Apr 9 12:12:43 2002 +Date: Tue, 1 Jul 2008 10:45:51 -0400 (EDT) +To: Greg KH <greg@kroah.com> +From: Greg Kroah-Hartman <gregkh@suse.de> +Subject: USB: revert "don't lose disconnections during suspend" + +This reverts Alan's previous patch so that the recent Hub changes will +apply cleanly. The above mentioned patch was needed for 2.6.26 to work +properly. + +Cc: Alan Stern <stern@rowland.harvard.edu> +Cc: Lukas Hejtmanek <xhejtman@ics.muni.cz> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/core/hub.c | 15 +++++++++++---- + 1 file changed, 11 insertions(+), 4 deletions(-) + +--- a/drivers/usb/core/hub.c ++++ b/drivers/usb/core/hub.c +@@ -713,11 +713,18 @@ static void hub_restart(struct usb_hub * + } + + /* Was the power session lost while we were suspended? */ +- status = hub_port_status(hub, port1, &portstatus, &portchange); ++ switch (type) { ++ case HUB_RESET_RESUME: ++ portstatus = 0; ++ portchange = USB_PORT_STAT_C_CONNECTION; ++ break; + +- /* If the device is gone, khubd will handle it later */ +- if (status == 0 && !(portstatus & USB_PORT_STAT_CONNECTION)) +- continue; ++ case HUB_RESET: ++ case HUB_RESUME: ++ status = hub_port_status(hub, port1, ++ &portstatus, &portchange); ++ break; ++ } + + /* For "USB_PERSIST"-enabled children we must + * mark the child device for reset-resume and |