summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-05-28 16:35:52 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-05-28 16:35:52 -0700
commitd9ec5ad24ce80b7ef69a0717363db661d13aada5 (patch)
tree0a808684e7d5e61427ccd0ecb7f3849164a32aef /drivers
parentb82e8005af14b51600714971e0c6420c4e334a50 (diff)
parent0737ac895afbfbe210557fa5fbafcca932d5fa7c (diff)
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/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
Diffstat (limited to 'drivers')
-rw-r--r--drivers/scsi/libata-core.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index fa476e7e0a4..b046ffa2210 100644
--- 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);
}