Skip to content

L
linux-davinci
Commit e42d7be2 authored by Jeff Garzik's avatar Jeff Garzik
Browse files
Options

Merge branch 'upstream-fixes' into upstream 

Conflicts:

	drivers/scsi/libata-core.c
parents 75e99585 0737ac89
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
drivers/scsi/libata-core.c
View file @ e42d7be2
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment