---

yaml --- r: 29469 b: refs/heads/master c: e42d7be h: refs/heads/master i: 29467: 3f85722 v: v3
git-mirror · May 28, 2006 · cae2528 · cae2528
1 parent 7d9f3db
commit cae2528
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75e995855f45a83afdae34d50c0b3ee14fb23b7a
+refs/heads/master: e42d7be25cf53548347bff8b8f43410704ea7bb0
diff --git a/trunk/drivers/scsi/libata-core.c b/trunk/drivers/scsi/libata-core.c
@@ -5021,6 +5021,9 @@ int ata_device_resume(struct ata_device *dev)
 
 	if (ap->flags & ATA_FLAG_SUSPENDED) {
 		struct ata_device *failed_dev;
+
+		ata_busy_wait(ap, ATA_BUSY | ATA_DRQ, 200000);
+
 		ap->flags &= ~ATA_FLAG_SUSPENDED;
 		while (ata_set_mode(ap, &failed_dev))
 			ata_dev_disable(failed_dev);