diff options
| author | Alan Stern <stern@rowland.harvard.edu> | 2008-12-17 17:20:38 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-07 10:00:12 -0800 |
| commit | 6fd9086a518d4f14213a32fe6c9ac17fabebbc1e (patch) | |
| tree | c7b59ccb00a69eb02188d9f0e40eec001078917f /drivers/usb/host/ohci-pci.c | |
| parent | a0d4922da2e4ccb0973095d8d29f36f6b1b5f703 (diff) | |
| download | op-kernel-dev-6fd9086a518d4f14213a32fe6c9ac17fabebbc1e.zip op-kernel-dev-6fd9086a518d4f14213a32fe6c9ac17fabebbc1e.tar.gz | |
USB: automatically enable wakeup for PCI host controllers
This patch (as1193b) enables wakeup during initialization for all PCI
host controllers, and it removes some code (and comments!) that are no
longer needed now that the PCI core automatically initializes wakeup
settings for all new devices.
The idea is that the bus should initialize wakeup, and the bus glue
or controller driver should enable it.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/host/ohci-pci.c')
| -rw-r--r-- | drivers/usb/host/ohci-pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/host/ohci-pci.c b/drivers/usb/host/ohci-pci.c index 8380cc2..8b28ae7 100644 --- a/drivers/usb/host/ohci-pci.c +++ b/drivers/usb/host/ohci-pci.c @@ -355,9 +355,9 @@ static int __devinit ohci_pci_start (struct usb_hcd *hcd) /* RWC may not be set for add-in PCI cards, since boot * firmware probably ignored them. This transfers PCI - * PM wakeup capabilities (once the PCI layer is fixed). + * PM wakeup capabilities. */ - if (device_may_wakeup(&pdev->dev)) + if (device_can_wakeup(&pdev->dev)) ohci->hc_control |= OHCI_CTRL_RWC; } #endif /* CONFIG_PM */ |
