Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 47389
b: refs/heads/master
c: ce053fa
h: refs/heads/master
i:
  47387: 5a267c0
v: v3
  • Loading branch information
Robert Hancock authored and Jeff Garzik committed Feb 9, 2007
1 parent f15c8b6 commit 0414af9
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 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: a2cfe81a59eea45a3f9afb4f652f7619982eac62
refs/heads/master: ce053fa8b532aa038fba6230052daae5cd60eae6
5 changes: 4 additions & 1 deletion trunk/drivers/ata/sata_nv.c
Original file line number Diff line number Diff line change
Expand Up @@ -1575,8 +1575,11 @@ static int nv_pci_device_resume(struct pci_dev *pdev)
{
struct ata_host *host = dev_get_drvdata(&pdev->dev);
struct nv_host_priv *hpriv = host->private_data;
int rc;

ata_pci_device_do_resume(pdev);
rc = ata_pci_device_do_resume(pdev);
if(rc)
return rc;

if (pdev->dev.power.power_state.event == PM_EVENT_SUSPEND) {
if(hpriv->type >= CK804) {
Expand Down

0 comments on commit 0414af9

Please sign in to comment.