Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 33625
b: refs/heads/master
c: 7334bb4
h: refs/heads/master
i:
  33623: 7b125e0
v: v3
  • Loading branch information
Danny Tholen authored and Linus Torvalds committed Aug 27, 2006
1 parent bfdd277 commit e5c9203
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: a2e0b56316fa90e137802fdad6a7c6a9b85c86c3
refs/heads/master: 7334bb4ae931159384acf168eacb0d5d6e0d083c
4 changes: 2 additions & 2 deletions trunk/drivers/ieee1394/ohci1394.c
Original file line number Diff line number Diff line change
Expand Up @@ -3552,6 +3552,8 @@ static int ohci1394_pci_resume (struct pci_dev *pdev)

static int ohci1394_pci_suspend (struct pci_dev *pdev, pm_message_t state)
{
pci_save_state(pdev);

#ifdef CONFIG_PPC_PMAC
if (machine_is(powermac)) {
struct device_node *of_node;
Expand All @@ -3563,8 +3565,6 @@ static int ohci1394_pci_suspend (struct pci_dev *pdev, pm_message_t state)
}
#endif

pci_save_state(pdev);

return 0;
}

Expand Down

0 comments on commit e5c9203

Please sign in to comment.