From dbf26bffb33420774deba6e8c73fd05f1c9fba21 Mon Sep 17 00:00:00 2001
From: Tejun Heo <htejun@gmail.com>
Date: Mon, 6 Aug 2007 18:36:24 +0900
Subject: [PATCH] --- yaml --- r: 68063 b: refs/heads/master c:
 e3667ebf857ba744b5211c90d46f6a17dd9a2479 h: refs/heads/master i:   68061:
 558f103ca8babe36e5204c4a633d79bce1b7a1f9   68059:
 0903d57ade8edba2c2d93e963b3362316358aae9   68055:
 85769778d0de8256751036c88cef27b171cc0df5   68047:
 6d63ffc3b3875312f92881a20d7e3cebaeb14411   68031:
 218e50d4c8c3607aec46adbdc46199ab44e7f382 v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/ata/libata-core.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a110ceba5f81..4ad87aa648b0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41bda9c98035dd3589b02cbc1de02f71d2faf9c8
+refs/heads/master: e3667ebf857ba744b5211c90d46f6a17dd9a2479
diff --git a/trunk/drivers/ata/libata-core.c b/trunk/drivers/ata/libata-core.c
index 14f299278f1b..8a79b976f08a 100644
--- a/trunk/drivers/ata/libata-core.c
+++ b/trunk/drivers/ata/libata-core.c
@@ -5912,6 +5912,7 @@ static int ata_host_request_pm(struct ata_host *host, pm_message_t mesg,
 
 	for (i = 0; i < host->n_ports; i++) {
 		struct ata_port *ap = host->ports[i];
+		struct ata_link *link;
 
 		/* Previous resume operation might still be in
 		 * progress.  Wait for PM_PENDING to clear.
@@ -5931,8 +5932,10 @@ static int ata_host_request_pm(struct ata_host *host, pm_message_t mesg,
 		}
 
 		ap->pflags |= ATA_PFLAG_PM_PENDING;
-		ap->link.eh_info.action |= action;
-		ap->link.eh_info.flags |= ehi_flags;
+		__ata_port_for_each_link(link, ap) {
+			link->eh_info.action |= action;
+			link->eh_info.flags |= ehi_flags;
+		}
 
 		ata_port_schedule_eh(ap);