---

yaml --- r: 96947 b: refs/heads/master c: 0cbf071 h: refs/heads/master i: 96945: 655ff9b 96943: 39a8cf9 v: v3
git-mirror · May 19, 2008 · cb4b6dc · cb4b6dc
1 parent 05b02ba
commit cb4b6dc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7715a6f9cdb9c1422d2b1f4fea21b1fe86b5b0fe
+refs/heads/master: 0cbf0711a1ebcc4d3aea8e11def684afc2c07ef8
diff --git a/trunk/drivers/ata/libata-core.c b/trunk/drivers/ata/libata-core.c
@@ -3653,9 +3653,13 @@ int sata_link_hardreset(struct ata_link *link, const unsigned long *timing,
 	if (check_ready)
 		rc = ata_wait_ready(link, deadline, check_ready);
  out:
-	if (rc && rc != -EAGAIN)
+	if (rc && rc != -EAGAIN) {
+		/* online is set iff link is online && reset succeeded */
+		if (online)
+			*online = false;
 		ata_link_printk(link, KERN_ERR,
 				"COMRESET failed (errno=%d)\n", rc);
+	}
 	DPRINTK("EXIT, rc=%d\n", rc);
 	return rc;
 }