]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ide-generic: set hwif->chipset
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Thu, 17 Apr 2008 22:46:21 +0000 (00:46 +0200)
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Thu, 17 Apr 2008 22:46:21 +0000 (00:46 +0200)
This hwif->chipset fixup is already present in ide_device_add_all()
but for warm-plug support we also need to reserve not currently present
interfaces.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
drivers/ide/ide-generic.c

index 9ebec08eefd92258e66c88602c965a953ded4114..c1d8d71f87915d909e2aef53207fab026ce308b7 100644 (file)
@@ -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;