diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2005-02-15 03:13:47 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2005-02-15 03:13:47 -0500 |
| commit | 34e4475639bd2da852ec285fa39a57f517d1bfdd (patch) | |
| tree | e4f9729bf5a44b1bd77f6e9a7c8af24a1fda056f | |
| parent | 2cdcb18745900dc8ec6b233487dbe0dae6668eaf (diff) | |
This should fix u32 vs. pm_message_t confusion in firewire. No code
changes. Please apply,
Pavel
Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Jody McIntyre <scjody@modernduck.com>
| -rw-r--r-- | drivers/ieee1394/nodemgr.c | 2 | ||||
| -rw-r--r-- | drivers/ieee1394/ohci1394.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c index 79ab0c97f6a2..a1e30a66297b 100644 --- a/drivers/ieee1394/nodemgr.c +++ b/drivers/ieee1394/nodemgr.c @@ -1284,7 +1284,7 @@ static void nodemgr_suspend_ne(struct node_entry *ne) if (ud->device.driver && (!ud->device.driver->suspend || - ud->device.driver->suspend(&ud->device, 0, 0))) + ud->device.driver->suspend(&ud->device, PMSG_SUSPEND, 0))) device_release_driver(&ud->device); } up_write(&ne->device.bus->subsys.rwsem); diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c index 11fbdaa0e5ec..1439cf6a48f5 100644 --- a/drivers/ieee1394/ohci1394.c +++ b/drivers/ieee1394/ohci1394.c @@ -3512,7 +3512,7 @@ static int ohci1394_pci_resume (struct pci_dev *pdev) } -static int ohci1394_pci_suspend (struct pci_dev *pdev, u32 state) +static int ohci1394_pci_suspend (struct pci_dev *pdev, pm_message_t state) { #ifdef CONFIG_PMAC_PBOOK { |