diff --git a/[refs] b/[refs]
index 619112d55fc9..bc32711bac84 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96399487ad84b0d935923fe3652943159f36fb64
+refs/heads/master: 7bd5ed5dd4f12ba56c99c9b5a8838afbf121f397
diff --git a/trunk/drivers/scsi/esp.c b/trunk/drivers/scsi/esp.c
index 8e8fc43c1d22..ddb512463b45 100644
--- a/trunk/drivers/scsi/esp.c
+++ b/trunk/drivers/scsi/esp.c
@@ -1120,9 +1120,6 @@ static int __devexit esp_remove_common(struct esp *esp)
 
 	scsi_remove_host(esp->ehost);
 
-	scsi_host_put(esp->ehost);
-	esp->ehost = NULL;
-
 	ESP_INTSOFF(esp->dregs);
 #if 0
 	esp_reset_dma(esp);
@@ -1135,7 +1132,7 @@ static int __devexit esp_remove_common(struct esp *esp)
 	sbus_iounmap(esp->eregs, ESP_REG_SIZE);
 	esp->dma->allocated = 0;
 
-	kfree(esp);
+	scsi_host_put(esp->ehost);
 
 	return 0;
 }