Merge tag '4.4-scsi-mkp' into misc

[firefly-linux-kernel-4.4.55.git] / drivers / scsi / isci / init.c

diff --git a/drivers/scsi/isci/init.c b/drivers/scsi/isci/init.c
index 2f973df72d9b42657e7b67cc764846016e58428f..77128d680e3bc615732767ea428292c93ffb32fa 100644 (file)
--- a/drivers/scsi/isci/init.c
+++ b/drivers/scsi/isci/init.c
@@ -271,11 +271,11 @@ static void isci_unregister(struct isci_host *isci_host)
        if (!isci_host)
                return;
 
+       shost = to_shost(isci_host);
+       scsi_remove_host(shost);
        sas_unregister_ha(&isci_host->sas_ha);
 
-       shost = to_shost(isci_host);
        sas_remove_host(shost);
-       scsi_remove_host(shost);
        scsi_host_put(shost);
 }