From 071cd2f15e88434f5794d8dbb72d93e125026760 Mon Sep 17 00:00:00 2001 From: Marcello Maggioni Date: Thu, 26 May 2005 15:47:35 +0200 Subject: [PATCH] --- yaml --- r: 1409 b: refs/heads/master c: 284e423811495f632a7a334b2b93caba07d4f778 h: refs/heads/master i: 1407: 93b468b0b49d38cca16135e3618e1be22670a054 v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-probe.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4403cff3eaae..7ee621554e23 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 41bb4c43b34bcde7eb62cf19acdcf9f2eb13801d +refs/heads/master: 284e423811495f632a7a334b2b93caba07d4f778 diff --git a/trunk/drivers/ide/ide-probe.c b/trunk/drivers/ide/ide-probe.c index 53b84a84f6cb..5d876f53c697 100644 --- a/trunk/drivers/ide/ide-probe.c +++ b/trunk/drivers/ide/ide-probe.c @@ -697,13 +697,13 @@ static int wait_hwif_ready(ide_hwif_t *hwif) SELECT_DRIVE(&hwif->drives[0]); hwif->OUTB(8, hwif->io_ports[IDE_CONTROL_OFFSET]); mdelay(2); - rc = ide_wait_not_busy(hwif, 10000); + rc = ide_wait_not_busy(hwif, 35000); if (rc) return rc; SELECT_DRIVE(&hwif->drives[1]); hwif->OUTB(8, hwif->io_ports[IDE_CONTROL_OFFSET]); mdelay(2); - rc = ide_wait_not_busy(hwif, 10000); + rc = ide_wait_not_busy(hwif, 35000); /* Exit function with master reselected (let's be sane) */ SELECT_DRIVE(&hwif->drives[0]);