Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 247918
b: refs/heads/master
c: f2ba70a
h: refs/heads/master
v: v3
  • Loading branch information
Joe Perches authored and David S. Miller committed Nov 22, 2010
1 parent f17c561 commit 9c58dad
Show file tree
Hide file tree
Showing 2 changed files with 3 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: ba5787323d38084b30261e84510d4a173fcb493a
refs/heads/master: f2ba70a22c31a179226fa0517729104497a7853f
4 changes: 2 additions & 2 deletions trunk/drivers/ide/pmac.c
Original file line number Diff line number Diff line change
Expand Up @@ -1334,7 +1334,7 @@ pmac_ide_pci_attach(struct pci_dev *pdev, const struct pci_device_id *id)
static int
pmac_ide_pci_suspend(struct pci_dev *pdev, pm_message_t mesg)
{
pmac_ide_hwif_t *pmif = (pmac_ide_hwif_t *)pci_get_drvdata(pdev);
pmac_ide_hwif_t *pmif = pci_get_drvdata(pdev);
int rc = 0;

if (mesg.event != pdev->dev.power.power_state.event
Expand All @@ -1350,7 +1350,7 @@ pmac_ide_pci_suspend(struct pci_dev *pdev, pm_message_t mesg)
static int
pmac_ide_pci_resume(struct pci_dev *pdev)
{
pmac_ide_hwif_t *pmif = (pmac_ide_hwif_t *)pci_get_drvdata(pdev);
pmac_ide_hwif_t *pmif = pci_get_drvdata(pdev);
int rc = 0;

if (pdev->dev.power.power_state.event != PM_EVENT_ON) {
Expand Down

0 comments on commit 9c58dad

Please sign in to comment.