X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fpci%2Fpci.c;h=46d56c8ccf100b80e280e8f53703e76ca1293a25;hb=c7b5ebbddf7bcd3651947760f423e3783bbe6573;hp=05daa8cffa9069d4622a2dab89735ec10364d130;hpb=a2c21200f1c81b08cb55e417b68150bba439b646;p=linux-2.6.git

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 05daa8cff..46d56c8cc 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -291,10 +291,7 @@ pci_set_power_state(struct pci_dev *dev, int state)
 	/* Mandatory power management transition delays */
 	/* see PCI PM 1.1 5.6.1 table 18 */
 	if(state == 3 || dev->current_state == 3)
-	{
-		set_current_state(TASK_UNINTERRUPTIBLE);
-		schedule_timeout(HZ/100);
-	}
+		msleep(10);
 	else if(state == 2 || dev->current_state == 2)
 		udelay(200);
 	dev->current_state = state;
@@ -748,7 +745,7 @@ static int __devinit pci_init(void)
 	struct pci_dev *dev = NULL;
 
 	while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
-		pci_fixup_device(PCI_FIXUP_FINAL, dev);
+		pci_fixup_device(pci_fixup_final, dev);
 	}
 	return 0;
 }