diff options
author | Tejun Heo <htejun@gmail.com> | 2008-05-18 12:15:12 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-05-19 17:51:48 -0400 |
commit | 391191c116c088edc6794a6e5ace10a13928c2f6 (patch) | |
tree | b21e8e2ea81d589fbacbee5ff615db0d5e8e7c7d | |
parent | f1bbfb90e81dd84d59de6370689ee6fe6a71fee0 (diff) |
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: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
-rw-r--r-- | drivers/ata/libata-core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index ffc689d9e972..a12a27eb8c77 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c | |||
@@ -5615,7 +5615,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht) | |||
5615 | spin_lock_irqsave(ap->lock, flags); | 5615 | spin_lock_irqsave(ap->lock, flags); |
5616 | 5616 | ||
5617 | ehi->probe_mask |= ATA_ALL_DEVICES; | 5617 | ehi->probe_mask |= ATA_ALL_DEVICES; |
5618 | ehi->action |= ATA_EH_RESET; | 5618 | ehi->action |= ATA_EH_RESET | ATA_EH_LPM; |
5619 | ehi->flags |= ATA_EHI_NO_AUTOPSY | ATA_EHI_QUIET; | 5619 | ehi->flags |= ATA_EHI_NO_AUTOPSY | ATA_EHI_QUIET; |
5620 | 5620 | ||
5621 | ap->pflags &= ~ATA_PFLAG_INITIALIZING; | 5621 | ap->pflags &= ~ATA_PFLAG_INITIALIZING; |
@@ -5648,7 +5648,6 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht) | |||
5648 | struct ata_port *ap = host->ports[i]; | 5648 | struct ata_port *ap = host->ports[i]; |
5649 | 5649 | ||
5650 | ata_scsi_scan_host(ap, 1); | 5650 | ata_scsi_scan_host(ap, 1); |
5651 | ata_lpm_schedule(ap, ap->pm_policy); | ||
5652 | } | 5651 | } |
5653 | 5652 | ||
5654 | return 0; | 5653 | return 0; |