dz.c: Resource management

[linux-2.6-omap-h63xx.git] / drivers / ide / ide-generic.c

diff --git a/drivers/ide/ide-generic.c b/drivers/ide/ide-generic.c
index 0f72b98d727f43ba72f4d68b2a53871ec9806bcd..709b9e4d2871239f75c8f6b8f59834f8375f003f 100644 (file)
--- a/drivers/ide/ide-generic.c
+++ b/drivers/ide/ide-generic.c
@@ -14,10 +14,22 @@
 
 static int __init ide_generic_init(void)
 {
+       u8 idx[MAX_HWIFS];
+       int i;
+
        if (ide_hwifs[0].io_ports[IDE_DATA_OFFSET])
                ide_get_lock(NULL, NULL); /* for atari only */
 
-       (void)ideprobe_init();
+       for (i = 0; i < MAX_HWIFS; i++) {
+               ide_hwif_t *hwif = &ide_hwifs[i];
+
+               if (hwif->io_ports[IDE_DATA_OFFSET] && !hwif->present)
+                       idx[i] = i;
+               else
+                       idx[i] = 0xff;
+       }
+
+       ide_device_add_all(idx, NULL);
 
        if (ide_hwifs[0].io_ports[IDE_DATA_OFFSET])
                ide_release_lock();     /* for atari only */