diff options
author | David Brownell <david-b@pacbell.net> | 2006-06-05 12:16:39 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-21 18:04:16 -0400 |
commit | be3cbc5f87d4b1fbd714644b6824ce4eb229f372 (patch) | |
tree | cea9e1dd8bc67ae65cb25dd7d46235234da7730f /drivers/usb/host/uhci-q.c | |
parent | ae671813affd947d2f21ff8e3cd329e466ee85b2 (diff) |
[PATCH] UHCI: various updates
This patch (as705) contains a small set of updates for uhci-hcd written
mostly by Dave Brownell:
* Root hub suspend messages come out labeled as root hub messages;
PCI messages should only come out when the pci device suspends.
* Rename the reset() method to better match its init() role
* Behave more like the other HCDs by returning -ESHUTDOWN for root-hub
suspend/resume errors.
* When an URB fails, associate the message with the usb device not
the host controller (it still hides endpoint and direction)
From: David Brownell <david-b@pacbell.net>
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/host/uhci-q.c')
-rw-r--r-- | drivers/usb/host/uhci-q.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/uhci-q.c b/drivers/usb/host/uhci-q.c index cbbaa4c1740f..b173d914d748 100644 --- a/drivers/usb/host/uhci-q.c +++ b/drivers/usb/host/uhci-q.c | |||
@@ -910,7 +910,7 @@ static int uhci_result_common(struct uhci_hcd *uhci, struct urb *urb) | |||
910 | uhci_packetout(td_token(td))); | 910 | uhci_packetout(td_token(td))); |
911 | if ((debug == 1 && ret != -EPIPE) || debug > 1) { | 911 | if ((debug == 1 && ret != -EPIPE) || debug > 1) { |
912 | /* Some debugging code */ | 912 | /* Some debugging code */ |
913 | dev_dbg(uhci_dev(uhci), | 913 | dev_dbg(&urb->dev->dev, |
914 | "%s: failed with status %x\n", | 914 | "%s: failed with status %x\n", |
915 | __FUNCTION__, status); | 915 | __FUNCTION__, status); |
916 | 916 | ||