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

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

libata: don't schedule LPM action seperately during probing 



There's no reason to schedule LPM action after probing is complete
causing another EH iteration.  Just schedule it together with probing
itself.

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent f1bbfb90

drivers/ata/libata-core.c

+1 −2
Original line number Diff line number Diff line
@@ -5615,7 +5615,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht) 
			spin_lock_irqsave(ap->lock, flags);



			ehi->probe_mask |= ATA_ALL_DEVICES;

			ehi->action |= ATA_EH_RESET;

			ehi->action |= ATA_EH_RESET | ATA_EH_LPM;

			ehi->flags |= ATA_EHI_NO_AUTOPSY | ATA_EHI_QUIET;



			ap->pflags &= ~ATA_PFLAG_INITIALIZING;
@@ -5648,7 +5648,6 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht) 
		struct ata_port *ap = host->ports[i];



		ata_scsi_scan_host(ap, 1);

		ata_lpm_schedule(ap, ap->pm_policy);

	}



	return 0;