Commit d9ec5ad2 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'upstream-fixes' of

* 'upstream-fixes' of
  [PATCH] the latest consensus libata resume fix
parents b82e8005 0737ac89
......@@ -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;
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