vserver 2.0 rc7

[linux-2.6.git] / drivers / message / fusion / mptbase.c

diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index e13a041..8b22630 100644 (file)
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -1429,7 +1429,7 @@ mptbase_shutdown(struct device * dev)
  *
  */
 static int
-mptbase_suspend(struct pci_dev *pdev, u32 state)
+mptbase_suspend(struct pci_dev *pdev, pm_message_t state)
 {
        u32 device_state;
        MPT_ADAPTER *ioc = pci_get_drvdata(pdev);
@@ -3137,8 +3137,7 @@ mpt_diag_reset(MPT_ADAPTER *ioc, int ignore, int sleepFlag)
 
                                /* wait 1 sec */
                                if (sleepFlag == CAN_SLEEP) {
-                                       set_current_state(TASK_INTERRUPTIBLE);
-                                       schedule_timeout(1000 * HZ / 1000);
+                                       ssleep(1);
                                } else {
                                        mdelay (1000);
                                }
@@ -5914,7 +5913,7 @@ fusion_init(void)
 #ifdef CONFIG_PROC_FS
        (void) procmpt_create();
 #endif
-       r = pci_module_init(&mptbase_driver);
+       r = pci_register_driver(&mptbase_driver);
        if(r)
                return(r);