ide: fix handling of busy I/O resources in probe_hwif()
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Fri, 1 Feb 2008 22:09:34 +0000 (23:09 +0100)
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Fri, 1 Feb 2008 22:09:34 +0000 (23:09 +0100)
It could be that I/O resources are busy because some other host driver
has already claimed them so don't unregister the devices.

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

index 21672001a8ad654573295f11d6b2f4c86dc5f7f4..873471dfb9b340c4907b7259b7866436324e11b3 100644 (file)
@@ -727,18 +727,7 @@ static void probe_hwif(ide_hwif_t *hwif)
 
        if ((hwif->chipset != ide_4drives || !hwif->mate || !hwif->mate->present) &&
            (ide_hwif_request_regions(hwif))) {
-               u16 msgout = 0;
-               for (unit = 0; unit < MAX_DRIVES; ++unit) {
-                       ide_drive_t *drive = &hwif->drives[unit];
-                       if (drive->present) {
-                               drive->present = 0;
-                               printk(KERN_ERR "%s: ERROR, PORTS ALREADY IN USE\n",
-                                       drive->name);
-                               msgout = 1;
-                       }
-               }
-               if (!msgout)
-                       printk(KERN_ERR "%s: ports already in use, skipping probe\n",
+               printk(KERN_ERR "%s: ports already in use, skipping probe\n",
                                hwif->name);
                return; 
        }