diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-10-06 08:27:45 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-07 07:07:18 -0400 |
| commit | 032665a26f5fe230509c4d35bd53f69fb6aa45b0 (patch) | |
| tree | 577f6d560b7e1601c73f7d15f7c11f53d80b948d | |
| parent | e13ee546bb06453939014c7b854e77fb643fd6f1 (diff) | |
Revert "Revert "ide: try to use PIO Mode 0 during probe if possible""
This reverts commit 24df31acaff8465d797f0006437b45ad0f2a5cb1.
The root cause of reported system hangs was (now fixed) sis5513 bug
and not "ide: try to use PIO Mode 0 during probe if possible" change
(commit 6029336426a2b43e4bc6f4a84be8789a047d139e) so the revert was
incorrect (it simply replaced one regression with the other one).
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -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 4d76ba473097..63c53d65e875 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) | |||
| 1046 | if (port_ops && port_ops->init_dev) | 1046 | if (port_ops && port_ops->init_dev) |
| 1047 | port_ops->init_dev(drive); | 1047 | port_ops->init_dev(drive); |
| 1048 | } | 1048 | } |
| 1049 | |||
| 1050 | ide_port_for_each_dev(i, drive, hwif) { | ||
| 1051 | /* | ||
| 1052 | * default to PIO Mode 0 before we figure out | ||
| 1053 | * the most suited mode for the attached device | ||
| 1054 | */ | ||
| 1055 | if (port_ops && port_ops->set_pio_mode) | ||
| 1056 | port_ops->set_pio_mode(drive, 0); | ||
| 1057 | } | ||
| 1049 | } | 1058 | } |
| 1050 | 1059 | ||
| 1051 | static void ide_init_port(ide_hwif_t *hwif, unsigned int port, | 1060 | static void ide_init_port(ide_hwif_t *hwif, unsigned int port, |
