From 5d2a4bbf165baa5f25d2be8ec06cc7d1882b31de Mon Sep 17 00:00:00 2001
From: Tejun Heo <htejun@gmail.com>
Date: Sat, 24 Jun 2006 20:30:18 +0900
Subject: [PATCH] --- yaml --- r: 30903 b: refs/heads/master c:
 64f65ca6e7a5a42df22ff29dadfff389dc388f65 h: refs/heads/master i:   30901:
 e97d30883b215a399bcc0a9bfb8c3ea745de8af1   30899:
 dfb8d402425844bc8269691b962435d810dcd016   30895:
 a40fa54b21e0eb72302634a8fdc0af84cdd9fb82 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/scsi/libata-eh.c | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2fe787ac7563..e1de048f0c87 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af181c2d765ec9735356bc313ab9e844ec2c7a24
+refs/heads/master: 64f65ca6e7a5a42df22ff29dadfff389dc388f65
diff --git a/trunk/drivers/scsi/libata-eh.c b/trunk/drivers/scsi/libata-eh.c
index 126be36289a7..c7e6298db050 100644
--- a/trunk/drivers/scsi/libata-eh.c
+++ b/trunk/drivers/scsi/libata-eh.c
@@ -93,6 +93,13 @@ static int ata_ering_map(struct ata_ering *ering,
 	return rc;
 }
 
+static unsigned int ata_eh_dev_action(struct ata_device *dev)
+{
+	struct ata_eh_context *ehc = &dev->ap->eh_context;
+
+	return ehc->i.action | ehc->i.dev_action[dev->devno];
+}
+
 static void ata_eh_clear_action(struct ata_device *dev,
 				struct ata_eh_info *ehi, unsigned int action)
 {
@@ -1592,7 +1599,7 @@ static int ata_eh_revalidate_and_attach(struct ata_port *ap,
 		unsigned int action;
 
 		dev = &ap->device[i];
-		action = ehc->i.action | ehc->i.dev_action[dev->devno];
+		action = ata_eh_dev_action(dev);
 
 		if (action & ATA_EH_REVALIDATE && ata_dev_enabled(dev)) {
 			if (ata_port_offline(ap)) {