Merge branch 'upstream-fixes' into upstream

Conflicts: drivers/scsi/libata-core.c
git-mirror · May 28, 2006 · e42d7be · e42d7be
2 parents 75e9958 + 0737ac8
commit e42d7be
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/drivers/scsi/libata-core.c b/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);