1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c
index f6c336b05d5b..662b2321d1b0 100644
--- a/drivers/scsi/aic94xx/aic94xx_init.c
+++ b/drivers/scsi/aic94xx/aic94xx_init.c
@@ -73,7 +73,6 @@ static struct scsi_host_template aic94xx_sht = {
         .eh_bus_reset_handler   = sas_eh_bus_reset_handler,
         .target_destroy         = sas_target_destroy,
         .ioctl                  = sas_ioctl,
-        .use_blk_tags           = 1,
         .track_queue_depth      = 1,
 };
 
@@ -704,10 +703,10 @@ static int asd_unregister_sas_ha(struct asd_ha_struct *asd_ha)
 {
         int err;
 
+        scsi_remove_host(asd_ha->sas_ha.core.shost);
         err = sas_unregister_ha(&asd_ha->sas_ha);
 
         sas_remove_host(asd_ha->sas_ha.core.shost);
-        scsi_remove_host(asd_ha->sas_ha.core.shost);
         scsi_host_put(asd_ha->sas_ha.core.shost);
 
         kfree(asd_ha->sas_ha.sas_phy);