Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 344435
b: refs/heads/master
c: 04a3f5b
h: refs/heads/master
i:
  344433: 015c635
  344431: 5e30950
v: v3
  • Loading branch information
Brian Norris authored and Jeff Garzik committed Dec 3, 2012
1 parent fe0b4fd commit 8cd5bf5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 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: 1645bf1b51e5788a18cb6af7cfbb221ee17a6e8b
refs/heads/master: 04a3f5b7d2961a05b428abc75b30e2dc85f88ac6
7 changes: 3 additions & 4 deletions trunk/drivers/ata/libata-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -6287,8 +6287,7 @@ void ata_host_detach(struct ata_host *host)
*/
void ata_pci_remove_one(struct pci_dev *pdev)
{
struct device *dev = &pdev->dev;
struct ata_host *host = dev_get_drvdata(dev);
struct ata_host *host = pci_get_drvdata(pdev);

ata_host_detach(host);
}
Expand Down Expand Up @@ -6357,7 +6356,7 @@ int ata_pci_device_do_resume(struct pci_dev *pdev)

int ata_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg)
{
struct ata_host *host = dev_get_drvdata(&pdev->dev);
struct ata_host *host = pci_get_drvdata(pdev);
int rc = 0;

rc = ata_host_suspend(host, mesg);
Expand All @@ -6371,7 +6370,7 @@ int ata_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg)

int ata_pci_device_resume(struct pci_dev *pdev)
{
struct ata_host *host = dev_get_drvdata(&pdev->dev);
struct ata_host *host = pci_get_drvdata(pdev);
int rc;

rc = ata_pci_device_do_resume(pdev);
Expand Down

0 comments on commit 8cd5bf5

Please sign in to comment.