[SCSI] hptiop: HighPoint RocketRAID 3xxx controller driver
Updates:
- don't bypass SYNCHRONIZE_CACHE command
- return SCSI_MLQUEUE_HOST_BUSY when no free request slots
- move scsi_remove_host() to the begin of hpt_remove(), or it will
not work after resources being released.
Signed-off-by: HighPoint Linux Team <linux@highpoint-tech.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
diff --git a/drivers/scsi/hptiop.c b/drivers/scsi/hptiop.c
index 8302f3b..a96751c 100644
--- a/drivers/scsi/hptiop.c
+++ b/drivers/scsi/hptiop.c
@@ -504,19 +504,10 @@
BUG_ON(!done);
scp->scsi_done = done;
- /*
- * hptiop_shutdown will flash controller cache.
- */
- if (scp->cmnd[0] == SYNCHRONIZE_CACHE) {
- scp->result = DID_OK<<16;
- goto cmd_done;
- }
-
_req = get_req(hba);
if (_req == NULL) {
dprintk("hptiop_queuecmd : no free req\n");
- scp->result = DID_BUS_BUSY << 16;
- goto cmd_done;
+ return SCSI_MLQUEUE_HOST_BUSY;
}
_req->scp = scp;
@@ -1429,6 +1420,8 @@
dprintk("scsi%d: hptiop_remove\n", hba->host->host_no);
+ scsi_remove_host(host);
+
spin_lock(&hptiop_hba_list_lock);
list_del_init(&hba->link);
spin_unlock(&hptiop_hba_list_lock);
@@ -1448,7 +1441,6 @@
pci_set_drvdata(hba->pcidev, NULL);
pci_disable_device(hba->pcidev);
- scsi_remove_host(host);
scsi_host_put(host);
}