aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2006-06-24 00:58:34 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2006-06-24 02:16:13 -0400
commit7bd5ed5dd4f12ba56c99c9b5a8838afbf121f397 (patch)
treeaff1f778fe94307880cf9b6b972fe7aafd924252
parent96399487ad84b0d935923fe3652943159f36fb64 (diff)
[SCSI] esp: Fix bug in esp_remove_common.
Do not try to kfree(esp), scsi_host_put() takes care of that. Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/scsi/esp.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/scsi/esp.c b/drivers/scsi/esp.c
index 8e8fc43c1d22..ddb512463b45 100644
--- a/drivers/scsi/esp.c
+++ b/drivers/scsi/esp.c
@@ -1120,9 +1120,6 @@ static int __devexit esp_remove_common(struct esp *esp)
1120 1120
1121 scsi_remove_host(esp->ehost); 1121 scsi_remove_host(esp->ehost);
1122 1122
1123 scsi_host_put(esp->ehost);
1124 esp->ehost = NULL;
1125
1126 ESP_INTSOFF(esp->dregs); 1123 ESP_INTSOFF(esp->dregs);
1127#if 0 1124#if 0
1128 esp_reset_dma(esp); 1125 esp_reset_dma(esp);
@@ -1135,7 +1132,7 @@ static int __devexit esp_remove_common(struct esp *esp)
1135 sbus_iounmap(esp->eregs, ESP_REG_SIZE); 1132 sbus_iounmap(esp->eregs, ESP_REG_SIZE);
1136 esp->dma->allocated = 0; 1133 esp->dma->allocated = 0;
1137 1134
1138 kfree(esp); 1135 scsi_host_put(esp->ehost);
1139 1136
1140 return 0; 1137 return 0;
1141} 1138}