]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Revert "ide: try to use PIO Mode 0 during probe if possible"
authorDavid S. Miller <davem@davemloft.net>
Mon, 5 Oct 2009 04:00:17 +0000 (21:00 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 5 Oct 2009 04:00:17 +0000 (21:00 -0700)
This reverts commit 6029336426a2b43e4bc6f4a84be8789a047d139e.

Based upon a report by David Fries, wherein his system hangs
on bootup with sis5513 controller, right after the CDROM
is registered by ide-cd.c and the TOC is first read.

Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/ide/ide-probe.c

index 63c53d65e875222aa0d2cd60c2d9a5f9f1feb0b6..4d76ba473097ac2ad89295181f9c8adb5433156a 100644 (file)
@@ -1046,15 +1046,6 @@ static void ide_port_init_devices(ide_hwif_t *hwif)
                if (port_ops && port_ops->init_dev)
                        port_ops->init_dev(drive);
        }
-
-       ide_port_for_each_dev(i, drive, hwif) {
-               /*
-                * default to PIO Mode 0 before we figure out
-                * the most suited mode for the attached device
-                */
-               if (port_ops && port_ops->set_pio_mode)
-                       port_ops->set_pio_mode(drive, 0);
-       }
 }
 
 static void ide_init_port(ide_hwif_t *hwif, unsigned int port,