diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-01 23:09:34 +0100 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-02-01 23:09:34 +0100 |
| commit | cf7125ae05e5ac671eec2508656816bbc0a8c723 (patch) | |
| tree | c6b6c7d6155c1dabf775f9234ffc0f587aecf984 | |
| parent | 76166952bbc81dda1c8a8c14e75a2aa06f6c052c (diff) | |
| download | op-kernel-dev-cf7125ae05e5ac671eec2508656816bbc0a8c723.zip op-kernel-dev-cf7125ae05e5ac671eec2508656816bbc0a8c723.tar.gz | |
ide: fix handling of busy I/O resources in probe_hwif()
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>
| -rw-r--r-- | drivers/ide/ide-probe.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index 2167200..873471d 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c @@ -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; } |
