diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
index 85ec3cce43f1c9d1cade5e5bc51d90ce3c5610fe..14225923cd6e26643f852e2802c1c256a48904d0 100644
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
@@ -343,7 +343,7 @@ static void scsi_host_dev_release(struct device *dev)
 
 	ida_simple_remove(&host_index_ida, shost->host_no);
 
-	if (parent)
+	if (shost->shost_state != SHOST_CREATED)
 		put_device(parent);
 	kfree(shost);
 }