diff options
author | Alan Stern <stern@rowland.harvard.edu> | 2010-06-25 14:02:14 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-10 17:35:37 -0400 |
commit | 4147200d25c423e627ab4487530b3d9f2ef829c8 (patch) | |
tree | 7261fbfd97782482d18333f1b0e9de0e2e4bf968 /drivers/usb/host/uhci-hcd.c | |
parent | 057c58bfb1dc9bbb75b8ba3b6c6336cfca63b9d0 (diff) |
USB: add do_wakeup parameter for PCI HCD suspend
This patch (as1385) adds a "do_wakeup" parameter to the pci_suspend
method used by PCI-based host controller drivers. ehci-hcd in
particular needs to know whether or not to enable wakeup when
suspending a controller. Although that information is currently
available through device_may_wakeup(), when support is added for
runtime suspend this will no longer be true.
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-hcd.c')
-rw-r--r-- | drivers/usb/host/uhci-hcd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c index 2743ec770f0c..a7850f51fdc5 100644 --- a/drivers/usb/host/uhci-hcd.c +++ b/drivers/usb/host/uhci-hcd.c | |||
@@ -788,7 +788,7 @@ static int uhci_rh_resume(struct usb_hcd *hcd) | |||
788 | return rc; | 788 | return rc; |
789 | } | 789 | } |
790 | 790 | ||
791 | static int uhci_pci_suspend(struct usb_hcd *hcd) | 791 | static int uhci_pci_suspend(struct usb_hcd *hcd, bool do_wakeup) |
792 | { | 792 | { |
793 | struct uhci_hcd *uhci = hcd_to_uhci(hcd); | 793 | struct uhci_hcd *uhci = hcd_to_uhci(hcd); |
794 | int rc = 0; | 794 | int rc = 0; |