Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 68063
b: refs/heads/master
c: e3667eb
h: refs/heads/master
i:
  68061: 558f103
  68059: 0903d57
  68055: 8576977
  68047: 6d63ffc
  68031: 218e50d
v: v3
  • Loading branch information
Tejun Heo authored and Jeff Garzik committed Oct 12, 2007
1 parent 472bc70 commit dbf26bf
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 41bda9c98035dd3589b02cbc1de02f71d2faf9c8
refs/heads/master: e3667ebf857ba744b5211c90d46f6a17dd9a2479
7 changes: 5 additions & 2 deletions trunk/drivers/ata/libata-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -5912,6 +5912,7 @@ static int ata_host_request_pm(struct ata_host *host, pm_message_t mesg,

for (i = 0; i < host->n_ports; i++) {
struct ata_port *ap = host->ports[i];
struct ata_link *link;

/* Previous resume operation might still be in
* progress. Wait for PM_PENDING to clear.
Expand All @@ -5931,8 +5932,10 @@ static int ata_host_request_pm(struct ata_host *host, pm_message_t mesg,
}

ap->pflags |= ATA_PFLAG_PM_PENDING;
ap->link.eh_info.action |= action;
ap->link.eh_info.flags |= ehi_flags;
__ata_port_for_each_link(link, ap) {
link->eh_info.action |= action;
link->eh_info.flags |= ehi_flags;
}

ata_port_schedule_eh(ap);

Expand Down

0 comments on commit dbf26bf

Please sign in to comment.