Skip to content

Commit

Permalink
[PATCH] libata: use ata_dev_disable() in ata_bus_probe()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tejun Heo authored and Jeff Garzik committed Mar 24, 2006
1 parent 0b8efb0 commit fcef978
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions drivers/scsi/libata-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1363,8 +1363,6 @@ static int ata_dev_configure(struct ata_port *ap, struct ata_device *dev,
return 0;

err_out_nosup:
printk(KERN_WARNING "ata%u: dev %u not supported, ignoring\n",
ap->id, dev->devno);
DPRINTK("EXIT, err\n");
return rc;
}
Expand Down Expand Up @@ -1431,7 +1429,7 @@ static int ata_bus_probe(struct ata_port *ap)
}

if (ata_dev_configure(ap, dev, 1)) {
dev->class++; /* disable device */
ata_dev_disable(ap, dev);
continue;
}

Expand Down

0 comments on commit fcef978

Please sign in to comment.