From patchwork Mon Mar 8 21:48:49 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Stern X-Patchwork-Id: 84169 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o28LmoaF008403 for ; Mon, 8 Mar 2010 21:48:50 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755832Ab0CHVsu (ORCPT ); Mon, 8 Mar 2010 16:48:50 -0500 Received: from iolanthe.rowland.org ([192.131.102.54]:48898 "HELO iolanthe.rowland.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1755810Ab0CHVst (ORCPT ); Mon, 8 Mar 2010 16:48:49 -0500 Received: (qmail 1405 invoked by uid 2102); 8 Mar 2010 16:48:49 -0500 Received: from localhost (sendmail-bs@127.0.0.1) by localhost with SMTP; 8 Mar 2010 16:48:49 -0500 Date: Mon, 8 Mar 2010 16:48:49 -0500 (EST) From: Alan Stern X-X-Sender: stern@iolanthe.rowland.org To: Jesse Barnes cc: linux-pci@vger.kernel.org, "Rafael J. Wysocki" Subject: [PATCH] PCI: clearing wakeup flags not needed Message-ID: MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Mon, 08 Mar 2010 21:48:50 +0000 (UTC) Index: usb-2.6/drivers/pci/pci.c =================================================================== --- usb-2.6.orig/drivers/pci/pci.c +++ usb-2.6/drivers/pci/pci.c @@ -1450,7 +1450,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 { @@ -1474,7 +1473,6 @@ void platform_pci_wakeup_init(struct pci return; device_set_wakeup_capable(&dev->dev, true); - device_set_wakeup_enable(&dev->dev, false); platform_pci_sleep_wake(dev, false); }