From e473d2a3d9236812a8a3a9492db8a0cec5a01cf0 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Fri, 18 Apr 2008 00:46:21 +0200 Subject: [PATCH] --- yaml --- r: 89307 b: refs/heads/master c: ce9b248bb451134fcb41e189e83e3838fb57caf0 h: refs/heads/master i: 89305: 607e447b9d2a4ae36196ef5b6706cdc2d12664c2 89303: 339be3524bfe73a9f02cbcc1ed812c97dde7892f v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-generic.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4e56dd849da1..dec60e51c530 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a594eeb1a1d320981fccc29584b6f21fcebd765f +refs/heads/master: ce9b248bb451134fcb41e189e83e3838fb57caf0 diff --git a/trunk/drivers/ide/ide-generic.c b/trunk/drivers/ide/ide-generic.c index 9ebec08eefd9..c1d8d71f8791 100644 --- a/trunk/drivers/ide/ide-generic.c +++ b/trunk/drivers/ide/ide-generic.c @@ -20,7 +20,9 @@ static int __init ide_generic_init(void) for (i = 0; i < MAX_HWIFS; i++) { ide_hwif_t *hwif = &ide_hwifs[i]; - if (hwif->io_ports[IDE_DATA_OFFSET] && !hwif->present) + if (hwif->io_ports[IDE_DATA_OFFSET] && + (hwif->chipset == ide_unknown || + hwif->chipset == ide_forced)) idx[i] = i; else idx[i] = 0xff;