Merge remote-tracking branch 'scsi-queue/core-for-3.17' into for-next

3 files changed, 9 insertions, 2 deletions

diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 33318f5ebb4b..df3306019a7e 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -365,8 +365,8 @@ scsi_alloc_host_cmd_pool(struct Scsi_Host *shost)
         if (!pool)
                 return NULL;
 
-        pool->cmd_name = kasprintf(GFP_KERNEL, "%s_cmd", hostt->name);
-        pool->sense_name = kasprintf(GFP_KERNEL, "%s_sense", hostt->name);
+        pool->cmd_name = kasprintf(GFP_KERNEL, "%s_cmd", hostt->proc_name);
+        pool->sense_name = kasprintf(GFP_KERNEL, "%s_sense", hostt->proc_name);
         if (!pool->cmd_name || !pool->sense_name) {
                 scsi_free_host_cmd_pool(pool);
                 return NULL;
diff --git a/drivers/scsi/scsi_devinfo.c b/drivers/scsi/scsi_devinfo.c
index f969aca0b54e..49014a143c6a 100644
--- a/drivers/scsi/scsi_devinfo.c
+++ b/drivers/scsi/scsi_devinfo.c
@@ -222,6 +222,7 @@ static struct {
         {"PIONEER", "CD-ROM DRM-602X", NULL, BLIST_FORCELUN | BLIST_SINGLELUN},
         {"PIONEER", "CD-ROM DRM-604X", NULL, BLIST_FORCELUN | BLIST_SINGLELUN},
         {"PIONEER", "CD-ROM DRM-624X", NULL, BLIST_FORCELUN | BLIST_SINGLELUN},
+        {"Promise", "VTrak E610f", NULL, BLIST_SPARSELUN | BLIST_NO_RSOC},
         {"Promise", "", NULL, BLIST_SPARSELUN},
         {"QUANTUM", "XP34301", "1071", BLIST_NOTQ},
         {"REGAL", "CDC-4X", NULL, BLIST_MAX5LUN | BLIST_SINGLELUN},
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 50536cd6b3f2..56675dbbf681 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -900,6 +900,12 @@ static int scsi_add_lun(struct scsi_device *sdev, unsigned char *inq_result,
         if (*bflags & BLIST_USE_10_BYTE_MS)
                 sdev->use_10_for_ms = 1;
 
+        /* some devices don't like REPORT SUPPORTED OPERATION CODES
+         * and will simply timeout causing sd_mod init to take a very
+         * very long time */
+        if (*bflags & BLIST_NO_RSOC)
+                sdev->no_report_opcodes = 1;
+
         /* set the device running here so that slave configure
          * may do I/O */
         ret = scsi_device_set_state(sdev, SDEV_RUNNING);