summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-01-26 20:13:04 +0100
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-01-26 20:13:04 +0100
commit71518342bfdfbe508ee325ab5e20984ba2da7de2 (patch)
tree436adf2e36cb4c41f5edab1bab1a3d67fd182688
parentaae73b4ed721912dbd4909ae5f618080c64594de (diff)
downloadlinux-stable-71518342bfdfbe508ee325ab5e20984ba2da7de2.tar.gz
linux-stable-71518342bfdfbe508ee325ab5e20984ba2da7de2.tar.bz2
linux-stable-71518342bfdfbe508ee325ab5e20984ba2da7de2.zip
ide: add hwif->chipset fixup to ide_device_add()
Add hwif->chipset fixup identical to the one in ideprobe_init() to ide_device_add(). Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
-rw-r--r--drivers/ide/ide-probe.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 817564fba820..a7a1cd85f15d 100644
--- a/drivers/ide/ide-probe.c
+++ b/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++) {