--- x/drivers/scsi/scsi_scan.c
+++ s/drivers/scsi/scsi_scan.c
@@ -528,8 +528,6 @@ static struct scsi_target *scsi_alloc_ta
 	starget->max_target_blocked = SCSI_DEFAULT_TARGET_BLOCKED;
 	init_waitqueue_head(&starget->sdev_wq);
 
-	atomic_inc(&shost->target_count);
-
  retry:
 	spin_lock_irqsave(shost->host_lock, flags);
 
@@ -554,6 +552,7 @@ static struct scsi_target *scsi_alloc_ta
 		}
 	}
 	get_device(dev);
+	atomic_inc(&shost->target_count);
 
 	return starget;