X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fpci%2Fpci.c;h=ace518116cc5db887b7c35bc4478cd83c904507f;hb=c157dfa3e4aea5775389f2f4d53c040bc8813af1;hp=e632a58ba5d0e1d8b2124f66ae271e1be7858b8c;hpb=beef3129b3afb74817acff72fda4a9d951e3973e;p=linux-2.6-omap-h63xx.git

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index e632a58ba5d..ace518116cc 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1152,7 +1152,6 @@ int pci_prepare_to_sleep(struct pci_dev *dev)
 				break;
 		default:
 			target_state = state;
-			pci_enable_wake(dev, target_state, true);
 		}
 	} else if (device_may_wakeup(&dev->dev)) {
 		/*
@@ -1167,10 +1166,11 @@ int pci_prepare_to_sleep(struct pci_dev *dev)
 			while (target_state
 			      && !(dev->pme_support & (1 << target_state)))
 				target_state--;
-			pci_pme_active(dev, true);
 		}
 	}
 
+	pci_enable_wake(dev, target_state, true);
+
 	error = pci_set_power_state(dev, target_state);
 
 	if (error)