Merge bk://bk.arm.linux.org.uk/linux-2.6-serial

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Merge bk://bk.arm.linux.org.uk/linux-2.6-serial
into ppc970.osdl.org:/home/torvalds/v2.6/linux
7d95b6c7 · Linus Torvalds · 2f8269da · be7650a8 · 7d95b6c7
Commit 7d95b6c7 authored Aug 06, 2004 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

drivers/serial/8250_pci.c drivers/serial/8250_pci.c +1 -2

No files found.
--- a/drivers/serial/8250_pci.c
+++ b/drivers/serial/8250_pci.c
@@ -574,8 +574,7 @@ titan_400l_800l_setup(struct pci_dev *dev, struct pci_board *board,
 static int __devinit pci_xircom_init(struct pci_dev *dev)
 {
-	__set_current_state(TASK_UNINTERRUPTIBLE);
+	msleep(100);
-	schedule_timeout(HZ/10);
 	return 0;
 }