4 files changed, 28 insertions, 10 deletions

diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index db3c892f87fb..d40d6d15ae20 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -1686,9 +1686,14 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
                 ioc->bus_type = SAS;
         }
 
-        if (ioc->bus_type == SAS && mpt_msi_enable == -1)
-                ioc->msi_enable = 1;
-        else
+        if (mpt_msi_enable == -1) {
+                /* Enable on SAS, disable on FC and SPI */
+                if (ioc->bus_type == SAS)
+                        ioc->msi_enable = 1;
+                else
+                        ioc->msi_enable = 0;
+        } else
+                /* follow flag: 0 - disable; 1 - enable */
                 ioc->msi_enable = mpt_msi_enable;
 
         if (ioc->errata_flag_1064)
diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c
index e630b50966ec..c5946560c4e2 100644
--- a/drivers/message/fusion/mptctl.c
+++ b/drivers/message/fusion/mptctl.c
@@ -548,11 +548,15 @@ static int
 mptctl_fasync(int fd, struct file *filep, int mode)
 {
         MPT_ADAPTER     *ioc;
+        int ret;
 
+        lock_kernel();
         list_for_each_entry(ioc, &ioc_list, list)
                 ioc->aen_event_read_flag=0;
 
-        return fasync_helper(fd, filep, mode, &async_queue);
+        ret = fasync_helper(fd, filep, mode, &async_queue);
+        unlock_kernel();
+        return ret;
 }
 
 static int
diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c
index 25bcfcf36f2e..1effca4e40e1 100644
--- a/drivers/message/fusion/mptspi.c
+++ b/drivers/message/fusion/mptspi.c
@@ -1266,13 +1266,18 @@ mptspi_dv_renegotiate(struct _MPT_SCSI_HOST *hd)
 static int
 mptspi_ioc_reset(MPT_ADAPTER *ioc, int reset_phase)
 {
-        struct _MPT_SCSI_HOST *hd = shost_priv(ioc->sh);
         int rc;
 
         rc = mptscsih_ioc_reset(ioc, reset_phase);
 
-        if (reset_phase == MPT_IOC_POST_RESET)
+        /* only try to do a renegotiation if we're properly set up
+         * if we get an ioc fault on bringup, ioc->sh will be NULL */
+        if (reset_phase == MPT_IOC_POST_RESET &&
+            ioc->sh) {
+                struct _MPT_SCSI_HOST *hd = shost_priv(ioc->sh);
+
                 mptspi_dv_renegotiate(hd);
+        }
 
         return rc;
 }
diff --git a/drivers/message/i2o/i2o_config.c b/drivers/message/i2o/i2o_config.c
index c0fb77dc19bb..4238de98d4a6 100644
--- a/drivers/message/i2o/i2o_config.c
+++ b/drivers/message/i2o/i2o_config.c
@@ -1061,6 +1061,7 @@ static int cfg_open(struct inode *inode, struct file *file)
         if (!tmp)
                 return -ENOMEM;
 
+        lock_kernel();
         file->private_data = (void *)(i2o_cfg_info_id++);
         tmp->fp = file;
         tmp->fasync = NULL;
@@ -1074,6 +1075,7 @@ static int cfg_open(struct inode *inode, struct file *file)
         spin_lock_irqsave(&i2o_config_lock, flags);
         open_files = tmp;
         spin_unlock_irqrestore(&i2o_config_lock, flags);
+        unlock_kernel();
 
         return 0;
 }
@@ -1082,15 +1084,17 @@ static int cfg_fasync(int fd, struct file *fp, int on)
 {
         ulong id = (ulong) fp->private_data;
         struct i2o_cfg_info *p;
+        int ret = -EBADF;
 
+        lock_kernel();
         for (p = open_files; p; p = p->next)
                 if (p->q_id == id)
                         break;
 
-        if (!p)
-                return -EBADF;
-
-        return fasync_helper(fd, fp, on, &p->fasync);
+        if (p)
+                ret = fasync_helper(fd, fp, on, &p->fasync);
+        unlock_kernel();
+        return ret;
 }
 
 static int cfg_release(struct inode *inode, struct file *file)