2 files changed, 2 insertions, 1 deletions

diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 7757e558d523..6905ffd135b3 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -385,6 +385,7 @@ static struct scsi_target *scsi_alloc_target(struct device *parent,
         INIT_LIST_HEAD(&starget->siblings);
         INIT_LIST_HEAD(&starget->devices);
         starget->state = STARGET_RUNNING;
+        starget->scsi_level = SCSI_2;
  retry:
         spin_lock_irqsave(shost->host_lock, flags);
 
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index 259c90cfa367..c275dcac3f18 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -922,7 +922,7 @@ void scsi_sysfs_device_initialize(struct scsi_device *sdev)
         snprintf(sdev->sdev_classdev.class_id, BUS_ID_SIZE,
                  "%d:%d:%d:%d", sdev->host->host_no,
                  sdev->channel, sdev->id, sdev->lun);
-        sdev->scsi_level = SCSI_2;
+        sdev->scsi_level = starget->scsi_level;
         transport_setup_device(&sdev->sdev_gendev);
         spin_lock_irqsave(shost->host_lock, flags);
         list_add_tail(&sdev->same_target_siblings, &starget->devices);