From ac1228a028b1972469e86ea2222b800f69d4b63a Mon Sep 17 00:00:00 2001 From: Alan Stern Date: Mon, 8 Mar 2010 16:48:49 -0500 Subject: [PATCH] --- yaml --- r: 197895 b: refs/heads/master c: 52b265a12768b9a72679bec825eb82c784116464 h: refs/heads/master i: 197893: e02bea1d687e7e047a81358d75525011d32ddfc5 197891: cae5b689b4399ec6a79225c0abb0e36be3bc0a22 197887: 0c558c4ce7f5464467b0fd033079e50123723687 v: v3 --- [refs] | 2 +- trunk/drivers/pci/pci.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4c47a4917a42..5da8b19ec632 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 75568f8094eb0333e9c2109b23cbc8b82d318a3c +refs/heads/master: 52b265a12768b9a72679bec825eb82c784116464 diff --git a/trunk/drivers/pci/pci.c b/trunk/drivers/pci/pci.c index 37499127c801..60fcb6f02c91 100644 --- a/trunk/drivers/pci/pci.c +++ b/trunk/drivers/pci/pci.c @@ -1631,7 +1631,6 @@ void pci_pm_init(struct pci_dev *dev) * let the user space enable it to wake up the system as needed. */ device_set_wakeup_capable(&dev->dev, true); - device_set_wakeup_enable(&dev->dev, false); /* Disable the PME# generation functionality */ pci_pme_active(dev, false); } else { @@ -1655,7 +1654,6 @@ void platform_pci_wakeup_init(struct pci_dev *dev) return; device_set_wakeup_capable(&dev->dev, true); - device_set_wakeup_enable(&dev->dev, false); platform_pci_sleep_wake(dev, false); }