1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/scsi/mvsas/mv_init.c b/drivers/scsi/mvsas/mv_init.c
index e2d555c1bffc..90fdf0e859e3 100644
--- a/drivers/scsi/mvsas/mv_init.c
+++ b/drivers/scsi/mvsas/mv_init.c
@@ -65,7 +65,6 @@ static struct scsi_host_template mvs_sht = {
         .target_destroy         = sas_target_destroy,
         .ioctl                  = sas_ioctl,
         .shost_attrs            = mvst_host_attrs,
-        .use_blk_tags           = 1,
         .track_queue_depth      = 1,
 };
 
@@ -641,9 +640,9 @@ static void mvs_pci_remove(struct pci_dev *pdev)
         tasklet_kill(&((struct mvs_prv_info *)sha->lldd_ha)->mv_tasklet);
 #endif
 
+        scsi_remove_host(mvi->shost);
         sas_unregister_ha(sha);
         sas_remove_host(mvi->shost);
-        scsi_remove_host(mvi->shost);
 
         MVS_CHIP_DISP->interrupt_disable(mvi);
         free_irq(mvi->pdev->irq, sha);