git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
ieee1394: merge from Linus
[pandora-kernel.git]
/
drivers
/
ieee1394
/
ohci1394.c
diff --git
a/drivers/ieee1394/ohci1394.c
b/drivers/ieee1394/ohci1394.c
index
2283005
..
baa090d
100644
(file)
--- a/
drivers/ieee1394/ohci1394.c
+++ b/
drivers/ieee1394/ohci1394.c
@@
-3553,6
+3553,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;
@@
-3564,8
+3566,6
@@
static int ohci1394_pci_suspend (struct pci_dev *pdev, pm_message_t state)
}
#endif
- pci_save_state(pdev);
-
return 0;
}