diff options
author | Tejun Heo <htejun@gmail.com> | 2006-03-24 01:25:31 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-03-24 09:39:57 -0500 |
commit | fcef978f9d4bd6ec43f89031442ee205987a912a (patch) | |
tree | effbfe0b4fb59b8b36ce353c4aea697b2f14ebe3 /drivers/scsi/libata-core.c | |
parent | 0b8efb0a16a1915c507db5a9b9fb5ede082a68a2 (diff) |
[PATCH] libata: use ata_dev_disable() in ata_bus_probe()
We may or may not disable a device after ata_dev_configure() fails.
Kill 'not supported, ignoring' message in ata_dev_configure() and use
ata_dev_disable() in ata_bus_probe().
Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/scsi/libata-core.c')
-rw-r--r-- | drivers/scsi/libata-core.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c index d1530b9fd8e7..b08e79ffd769 100644 --- a/drivers/scsi/libata-core.c +++ b/drivers/scsi/libata-core.c | |||
@@ -1363,8 +1363,6 @@ static int ata_dev_configure(struct ata_port *ap, struct ata_device *dev, | |||
1363 | return 0; | 1363 | return 0; |
1364 | 1364 | ||
1365 | err_out_nosup: | 1365 | err_out_nosup: |
1366 | printk(KERN_WARNING "ata%u: dev %u not supported, ignoring\n", | ||
1367 | ap->id, dev->devno); | ||
1368 | DPRINTK("EXIT, err\n"); | 1366 | DPRINTK("EXIT, err\n"); |
1369 | return rc; | 1367 | return rc; |
1370 | } | 1368 | } |
@@ -1431,7 +1429,7 @@ static int ata_bus_probe(struct ata_port *ap) | |||
1431 | } | 1429 | } |
1432 | 1430 | ||
1433 | if (ata_dev_configure(ap, dev, 1)) { | 1431 | if (ata_dev_configure(ap, dev, 1)) { |
1434 | dev->class++; /* disable device */ | 1432 | ata_dev_disable(ap, dev); |
1435 | continue; | 1433 | continue; |
1436 | } | 1434 | } |
1437 | 1435 | ||