From 24054f80f631216ba7d513d62124dbaebd979147 Mon Sep 17 00:00:00 2001
From: Mark Lord <liml@rtr.ca>
Date: Wed, 14 May 2008 09:18:12 -0400
Subject: [PATCH] --- yaml --- r: 96933 b: refs/heads/master c:
 9dcffd99d0b1c0c1b8b2c0f85d240e791eca1055 h: refs/heads/master i:   96931:
 a985c35b8017532bcfedd77446a95f585c3ed600 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/ata/sata_mv.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e868cddbf9f7..d343259f13b6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68b90ee7c8046864301823d8d4449eb1ce1d2f74
+refs/heads/master: 9dcffd99d0b1c0c1b8b2c0f85d240e791eca1055
diff --git a/trunk/drivers/ata/sata_mv.c b/trunk/drivers/ata/sata_mv.c
index bb73b2222627..bbacdd90f554 100644
--- a/trunk/drivers/ata/sata_mv.c
+++ b/trunk/drivers/ata/sata_mv.c
@@ -2728,6 +2728,7 @@ static int mv_hardreset(struct ata_link *link, unsigned int *class,
 
 		rc = sata_link_hardreset(link, timing, deadline + extra,
 					 &online, NULL);
+		rc = online ? -EAGAIN : rc;
 		if (rc)
 			return rc;
 		sata_scr_read(link, SCR_STATUS, &sstatus);