From patchwork Tue Oct 6 22:27:45 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [2/2] Revert "Revert "ide: try to use PIO Mode 0 during probe if possible"" Date: Tue, 06 Oct 2009 12:27:45 -0000 From: Bartlomiej Zolnierkiewicz X-Patchwork-Id: 35162 Message-Id: <200910070027.45678.bzolnier@gmail.com> To: Linus Torvalds Cc: "David S. Miller" , Joao Ramos , David Fries , d.stussy@yahoo.com, linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org From: Bartlomiej Zolnierkiewicz Subject: [PATCH] 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 Cc: David S. Miller Cc: Joao Ramos Cc: David Fries Cc: d.stussy@yahoo.com --- 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,