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

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

[PATCH] libata: disable failed devices only once in ata_bus_probe() 



Devices which consumed all their changes used to be disabled every
iteration.  This causes unnecessary noise in the console output.
Disable once and leave alone.

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 7dd29dd6

drivers/scsi/libata-core.c

+7 −5
Original line number Diff line number Diff line
@@ -1411,12 +1411,9 @@ static int ata_bus_probe(struct ata_port *ap) 
	/* read IDENTIFY page and configure devices */

	for (i = 0; i < ATA_MAX_DEVICES; i++) {

		dev = &ap->device[i];

		dev->class = classes[i];



		if (!tries[i]) {

			ata_down_xfermask_limit(ap, dev, 1);

			ata_dev_disable(ap, dev);

		}

		if (tries[i])

			dev->class = classes[i];



		if (!ata_dev_enabled(dev))

			continue;
@@ -1477,6 +1474,11 @@ static int ata_bus_probe(struct ata_port *ap) 
			tries[dev->devno] = 0;

	}



	if (!tries[dev->devno]) {

		ata_down_xfermask_limit(ap, dev, 1);

		ata_dev_disable(ap, dev);

	}



	goto retry;

}