diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-08 11:59:06 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-08 11:59:06 -0700 |
commit | df87f344efac96cb9f9367e82509208216f1e0fa (patch) | |
tree | e5423f3973852736438382576f8a432d67e11713 /drivers/ide/ide-probe.c | |
parent | 385c51d6b1dc7cdbbb1b189d18bb4680d0714a37 (diff) | |
parent | 032665a26f5fe230509c4d35bd53f69fb6aa45b0 (diff) | |
download | kernel_samsung_smdk4412-df87f344efac96cb9f9367e82509208216f1e0fa.zip kernel_samsung_smdk4412-df87f344efac96cb9f9367e82509208216f1e0fa.tar.gz kernel_samsung_smdk4412-df87f344efac96cb9f9367e82509208216f1e0fa.tar.bz2 |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:
Revert "Revert "ide: try to use PIO Mode 0 during probe if possible""
sis5513: fix PIO setup for ATAPI devices
Diffstat (limited to 'drivers/ide/ide-probe.c')
-rw-r--r-- | drivers/ide/ide-probe.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index 4d76ba4..63c53d6 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c @@ -1046,6 +1046,15 @@ 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, |