2 files changed, 9 insertions, 0 deletions

diff --git a/drivers/scsi/esp_scsi.c b/drivers/scsi/esp_scsi.c
index a0b6d414953d..305eddef5ca1 100644
--- a/drivers/scsi/esp_scsi.c
+++ b/drivers/scsi/esp_scsi.c
@@ -2371,6 +2371,7 @@ static int esp_slave_alloc(struct scsi_device *dev)
         dev->hostdata = lp;
 
         tp->starget = dev->sdev_target;
+        tp->starget_ref++;
 
         spi_min_period(tp->starget) = esp->min_period;
         spi_max_offset(tp->starget) = 15;
@@ -2425,10 +2426,17 @@ static int esp_slave_configure(struct scsi_device *dev)
 
 static void esp_slave_destroy(struct scsi_device *dev)
 {
+        struct esp *esp = shost_priv(dev->host);
+        struct esp_target_data *tp = &esp->target[dev->id];
         struct esp_lun_data *lp = dev->hostdata;
 
         kfree(lp);
         dev->hostdata = NULL;
+
+        BUG_ON(tp->starget_ref <= 0);
+
+        if (!--tp->starget_ref)
+                tp->starget = NULL;
 }
 
 static int esp_eh_abort_handler(struct scsi_cmnd *cmd)
diff --git a/drivers/scsi/esp_scsi.h b/drivers/scsi/esp_scsi.h
index bb43a1388188..655e0b2240bf 100644
--- a/drivers/scsi/esp_scsi.h
+++ b/drivers/scsi/esp_scsi.h
@@ -322,6 +322,7 @@ struct esp_target_data {
         u8                      nego_goal_tags;
 
         struct scsi_target      *starget;
+        int                     starget_ref;
 };
 
 struct esp_event_ent {