]> err.no Git - linux-2.6/commitdiff
ide: add hwif->chipset fixup to ide_device_add()
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Sat, 26 Jan 2008 19:13:04 +0000 (20:13 +0100)
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Sat, 26 Jan 2008 19:13:04 +0000 (20:13 +0100)
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>
drivers/ide/ide-probe.c

index 817564fba820b259053a2101db33c990927671b6..a7a1cd85f15dc177e5ac5fcc4cca3efe17cf4f20 100644 (file)
@@ -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++) {