Merge tag '4.4-scsi-mkp' into misc

SCSI queue for 4.4.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/scsi/isci/init.c b/drivers/scsi/isci/init.c
index 2f973df72d9b..77128d680e3b 100644
--- 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);
 }