Merge branch 'upstream-fixes' into upstream

Conflicts: drivers/scsi/libata-core.c

Merge branch 'upstream-fixes' into upstream
Conflicts: drivers/scsi/libata-core.c
e42d7be2 · Jeff Garzik · 75e99585 · 0737ac89 · e42d7be2
Commit e42d7be2 authored May 28, 2006 by Jeff Garzik
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

drivers/scsi/libata-core.c drivers/scsi/libata-core.c +3 -0

No files found.
--- 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);