From ac804a601a44a9628d28d700f3ca88dd50a6898f Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Sat, 26 Jan 2008 20:13:04 +0100 Subject: [PATCH] --- yaml --- r: 77250 b: refs/heads/master c: 71518342bfdfbe508ee325ab5e20984ba2da7de2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-probe.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 87767d283e2f..0d230cb798e1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aae73b4ed721912dbd4909ae5f618080c64594de +refs/heads/master: 71518342bfdfbe508ee325ab5e20984ba2da7de2 diff --git a/trunk/drivers/ide/ide-probe.c b/trunk/drivers/ide/ide-probe.c index 817564fba820..a7a1cd85f15d 100644 --- a/trunk/drivers/ide/ide-probe.c +++ b/trunk/drivers/ide/ide-probe.c @@ -1405,8 +1405,12 @@ int ide_device_add(u8 idx[4]) hwif = &ide_hwifs[idx[i]]; - if (hwif->present) + if (hwif->present) { + if (hwif->chipset == ide_unknown || + hwif->chipset == ide_forced) + hwif->chipset = ide_generic; hwif_register_devices(hwif); + } } for (i = 0; i < 4; i++) {