Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/ker…

…nel/git/jgarzik/libata-dev * 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: [PATCH] the latest consensus libata resume fix
git-mirror · May 28, 2006 · d9ec5ad · d9ec5ad
2 parents b82e800 + 0737ac8
commit d9ec5ad
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
@@ -4297,6 +4297,7 @@ static int ata_start_drive(struct ata_port *ap, struct ata_device *dev)
 int ata_device_resume(struct ata_port *ap, struct ata_device *dev)
 {
 	if (ap->flags & ATA_FLAG_SUSPENDED) {
+		ata_busy_wait(ap, ATA_BUSY | ATA_DRQ, 200000);
 		ap->flags &= ~ATA_FLAG_SUSPENDED;
 		ata_set_mode(ap);
 	}