aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-05-28 16:32:59 -0400
committerJeff Garzik <jeff@garzik.org>2006-05-28 16:32:59 -0400
commite42d7be25cf53548347bff8b8f43410704ea7bb0 (patch)
tree7afd08ee70f929abec9118960508828e2d07f234
parent75e995855f45a83afdae34d50c0b3ee14fb23b7a (diff)
parent0737ac895afbfbe210557fa5fbafcca932d5fa7c (diff)
Merge branch 'upstream-fixes' into upstream
Conflicts: drivers/scsi/libata-core.c
-rw-r--r--drivers/scsi/libata-core.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index f19fe662f0c..abcf17ebda9 100644
--- 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);