X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fparport%2Fparport_pc.c;h=c6493ad7c0c86d070a79e3a4da4754432ef58b62;hb=684f7b296c0cb8238ce63f1828d33a00d5f3a26e;hp=97f723179f621d15ed3f9283a8a80446aa4a2cb0;hpb=c324b44c34050cf2a9b58830e11c974806bd85d8;p=linux-2.6

diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c
index 97f723179f..c6493ad7c0 100644
--- a/drivers/parport/parport_pc.c
+++ b/drivers/parport/parport_pc.c
@@ -173,8 +173,7 @@ static int change_mode(struct parport *p, int m)
 				if (time_after_eq (jiffies, expire))
 					/* The FIFO is stuck. */
 					return -EBUSY;
-				__set_current_state (TASK_INTERRUPTIBLE);
-				schedule_timeout ((HZ + 99) / 100);
+				schedule_timeout_interruptible(msecs_to_jiffies(10));
 				if (signal_pending (current))
 					break;
 			}
@@ -3010,7 +3009,7 @@ static int __init parport_pc_init_superio (int autoirq, int autodma)
 	struct pci_dev *pdev = NULL;
 	int ret = 0;
 
-	while ((pdev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, pdev)) != NULL) {
+	for_each_pci_dev(pdev) {
 		id = pci_match_id(parport_pc_pci_tbl, pdev);
 		if (id == NULL || id->driver_data >= last_sio)
 			continue;