Commit bcca06ef authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman

USB: don't enable wakeup by default for PCI host controllers

This patch (as1199) changes the initial wakeup settings for PCI USB
host controllers.  The controllers are marked as capable of waking the
system, but wakeup is not enabled by default.

It turns out that enabling wakeup for USB host controllers has a lot
of bad consequences.  As the simplest example, if a USB mouse or
keyboard is unplugged immediately after the computer is put to sleep,
the unplug will cause the system to wake back up again!  We are better
off marking them as wakeup-capable and leaving wakeup disabled.
Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Reported-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
CC: David Brownell <david-b@pacbell.net>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b90de8ae
...@@ -128,7 +128,6 @@ int usb_hcd_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) ...@@ -128,7 +128,6 @@ int usb_hcd_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
} }
pci_set_master(dev); pci_set_master(dev);
device_set_wakeup_enable(&dev->dev, 1);
retval = usb_add_hcd(hcd, dev->irq, IRQF_DISABLED | IRQF_SHARED); retval = usb_add_hcd(hcd, dev->irq, IRQF_DISABLED | IRQF_SHARED);
if (retval != 0) if (retval != 0)
......
...@@ -230,7 +230,7 @@ static int ehci_pci_setup(struct usb_hcd *hcd) ...@@ -230,7 +230,7 @@ static int ehci_pci_setup(struct usb_hcd *hcd)
pci_read_config_word(pdev, 0x62, &port_wake); pci_read_config_word(pdev, 0x62, &port_wake);
if (port_wake & 0x0001) { if (port_wake & 0x0001) {
dev_warn(&pdev->dev, "Enabling legacy PCI PM\n"); dev_warn(&pdev->dev, "Enabling legacy PCI PM\n");
device_init_wakeup(&pdev->dev, 1); device_set_wakeup_capable(&pdev->dev, 1);
} }
} }
......
...@@ -593,12 +593,10 @@ static int ohci_run (struct ohci_hcd *ohci) ...@@ -593,12 +593,10 @@ static int ohci_run (struct ohci_hcd *ohci)
* to be checked in case boot firmware (BIOS/SMM/...) has set up * to be checked in case boot firmware (BIOS/SMM/...) has set up
* wakeup in a way the bus isn't aware of (e.g., legacy PCI PM). * wakeup in a way the bus isn't aware of (e.g., legacy PCI PM).
* If the bus glue detected wakeup capability then it should * If the bus glue detected wakeup capability then it should
* already be enabled. Either way, if wakeup should be enabled * already be enabled; if so we'll just enable it again.
* but isn't, we'll enable it now.
*/ */
if ((ohci->hc_control & OHCI_CTRL_RWC) != 0 if ((ohci->hc_control & OHCI_CTRL_RWC) != 0)
&& !device_can_wakeup(hcd->self.controller)) device_set_wakeup_capable(hcd->self.controller, 1);
device_init_wakeup(hcd->self.controller, 1);
switch (ohci->hc_control & OHCI_CTRL_HCFS) { switch (ohci->hc_control & OHCI_CTRL_HCFS) {
case OHCI_USB_OPER: case OHCI_USB_OPER:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment