ChangeSet 1.1982.39.13, 2005/02/15 13:13:47-05:00, [EMAIL PROTECTED]
This should fix u32 vs. pm_message_t confusion in firewire. No code
changes. Please apply,
Pavel
Signed-off-by: Pavel Machek <[EMAIL PROTECTED]>
Signed-off-by: Jody McIntyre <[EMAIL PROTECTED]>
nodemgr.c | 2 +-
ohci1394.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff -Nru a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c
--- a/drivers/ieee1394/nodemgr.c 2005-03-28 23:06:51 -08:00
+++ b/drivers/ieee1394/nodemgr.c 2005-03-28 23:06:51 -08:00
@@ -1284,7 +1284,7 @@
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 -Nru a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c
--- a/drivers/ieee1394/ohci1394.c 2005-03-28 23:06:51 -08:00
+++ b/drivers/ieee1394/ohci1394.c 2005-03-28 23:06:51 -08:00
@@ -3512,7 +3512,7 @@
}
-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
{
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
