From ee8cb109367a949d2f3581585f9ed63fb73d16b0 Mon Sep 17 00:00:00 2001
From: Tejun Heo <htejun@gmail.com>
Date: Mon, 12 Jun 2006 14:11:43 +0900
Subject: [PATCH] --- yaml --- r: 29518 b: refs/heads/master c:
 aeb2ecd6096182cc080d37679080c0f088dcd4a4 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/scsi/libata-eh.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ad3fe8f6549d..ef3c3f44f90d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f9be7113b56eb5d013a611d9c65e8d1d2d3f7c94
+refs/heads/master: aeb2ecd6096182cc080d37679080c0f088dcd4a4
diff --git a/trunk/drivers/scsi/libata-eh.c b/trunk/drivers/scsi/libata-eh.c
index 782dfba573a9..531a4e11c078 100644
--- a/trunk/drivers/scsi/libata-eh.c
+++ b/trunk/drivers/scsi/libata-eh.c
@@ -1680,6 +1680,10 @@ static int ata_eh_recover(struct ata_port *ap, ata_prereset_fn_t prereset,
 	down_xfermask = 0;
 	rc = 0;
 
+	/* if UNLOADING, finish immediately */
+	if (ap->flags & ATA_FLAG_UNLOADING)
+		goto out;
+
 	/* skip EH if possible. */
 	if (ata_eh_skip_recovery(ap))
 		ehc->i.action = 0;