1 files changed, 18 insertions, 9 deletions

diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
index 6796597dcee..7bd4c0fc23c 100644
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
@@ -1149,11 +1149,6 @@ mptscsih_remove(struct pci_dev *pdev)
         MPT_SCSI_HOST           *hd;
         int sz1;
 
-        if(!host) {
-                mpt_detach(pdev);
-                return;
-        }
-
         scsi_remove_host(host);
 
         if((hd = shost_priv(host)) == NULL)
@@ -1711,7 +1706,7 @@ mptscsih_IssueTaskMgmt(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 id, int lun,
         if (issue_hard_reset) {
                 printk(MYIOC_s_WARN_FMT "Issuing Reset from %s!!\n",
                         ioc->name, __func__);
-                retval = mpt_HardResetHandler(ioc, CAN_SLEEP);
+                retval = mpt_Soft_Hard_ResetHandler(ioc, CAN_SLEEP);
                 mpt_free_msg_frame(ioc, mf);
         }
 
@@ -1728,6 +1723,7 @@ mptscsih_get_tm_timeout(MPT_ADAPTER *ioc)
         case FC:
                 return 40;
         case SAS:
+                return 30;
         case SPI:
         default:
                 return 10;
@@ -1777,7 +1773,7 @@ mptscsih_abort(struct scsi_cmnd * SCpnt)
                     ioc->name, SCpnt));
                 SCpnt->result = DID_NO_CONNECT << 16;
                 SCpnt->scsi_done(SCpnt);
-                retval = 0;
+                retval = SUCCESS;
                 goto out;
         }
 
@@ -1792,6 +1788,17 @@ mptscsih_abort(struct scsi_cmnd * SCpnt)
                 goto out;
         }
 
+        /* Task aborts are not supported for volumes.
+         */
+        if (vdevice->vtarget->raidVolume) {
+                dtmprintk(ioc, printk(MYIOC_s_DEBUG_FMT
+                    "task abort: raid volume (sc=%p)\n",
+                    ioc->name, SCpnt));
+                SCpnt->result = DID_RESET << 16;
+                retval = FAILED;
+                goto out;
+        }
+
         /* Find this command
          */
         if ((scpnt_idx = SCPNT_TO_LOOKUP_IDX(ioc, SCpnt)) < 0) {
@@ -1991,7 +1998,7 @@ mptscsih_host_reset(struct scsi_cmnd *SCpnt)
         /*  If our attempts to reset the host failed, then return a failed
          *  status.  The host will be taken off line by the SCSI mid-layer.
          */
-    retval = mpt_HardResetHandler(ioc, CAN_SLEEP);
+    retval = mpt_Soft_Hard_ResetHandler(ioc, CAN_SLEEP);
         if (retval < 0)
                 status = FAILED;
         else
@@ -2344,6 +2351,8 @@ mptscsih_slave_destroy(struct scsi_device *sdev)
         starget = scsi_target(sdev);
         vtarget = starget->hostdata;
         vdevice = sdev->hostdata;
+        if (!vdevice)
+                return;
 
         mptscsih_search_running_cmds(hd, vdevice);
         vtarget->num_luns--;
@@ -3040,7 +3049,7 @@ mptscsih_do_cmd(MPT_SCSI_HOST *hd, INTERNAL_CMD *io)
                 if (!timeleft) {
                         printk(MYIOC_s_WARN_FMT "Issuing Reset from %s!!\n",
                             ioc->name, __func__);
-                        mpt_HardResetHandler(ioc, CAN_SLEEP);
+                        mpt_Soft_Hard_ResetHandler(ioc, CAN_SLEEP);
                         mpt_free_msg_frame(ioc, mf);
                 }
                 goto out;