Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fcef978f authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

[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: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 0b8efb0a

drivers/scsi/libata-core.c

+1 −3
Original line number Diff line number Diff line
@@ -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;

}
@@ -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;

		}