From 3b4b0a488ae29f3c902b554663085922db8ef292 Mon Sep 17 00:00:00 2001
From: Tejun Heo <htejun@gmail.com>
Date: Sun, 23 Sep 2007 13:14:13 +0900
Subject: [PATCH] --- yaml --- r: 68120 b: refs/heads/master c:
 668108d73bbb1ae85f01db38d6be822fd28ece1f h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index d8dcb17cd855..8e372e05758c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f9df58cb27dfd605eced643bb3aa599fe4feeee8
+refs/heads/master: 668108d73bbb1ae85f01db38d6be822fd28ece1f
diff --git a/trunk/drivers/ata/libata-eh.c b/trunk/drivers/ata/libata-eh.c
index fbbf79163900..3c31e10caf21 100644
--- a/trunk/drivers/ata/libata-eh.c
+++ b/trunk/drivers/ata/libata-eh.c
@@ -2050,7 +2050,7 @@ int ata_eh_reset(struct ata_link *link, int classify,
 	if (rc == -EAGAIN)
 		rc = 0;
 
-	if (rc && try < ARRAY_SIZE(ata_eh_reset_timeouts)) {
+	if (rc && rc != -ERESTART && try < ARRAY_SIZE(ata_eh_reset_timeouts)) {
 		unsigned long now = jiffies;
 
 		if (time_before(now, deadline)) {