Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6:
  [SCSI] SCSI core: better initialization for sdev->scsi_level
  [SCSI] scsi_proc.c: display sdev->scsi_level correctly
  [SCSI] megaraid_sas: update version and author info
  [SCSI] megaraid_sas: return sync cache call with success
  [SCSI] megaraid_sas: replace pci_alloc_consitent with dma_alloc_coherent in ioctl path
  [SCSI] megaraid_sas: add bios_param in scsi_host_template
  [SCSI] megaraid_sas: do not process cmds if hw_crit_error is set
  [SCSI] scsi_transport.h should include scsi_device.h
  [SCSI] aic79xx: remove extra newline from info message
  [SCSI] scsi_scan.c: handle bad inquiry responses
  [SCSI] aic94xx: tie driver to the major number of the sequencer firmware
  [SCSI] lpfc: add PCI error recovery support
  [SCSI] megaraid: pci_module_init to pci_register_driver
  [SCSI] tgt: fix the user/kernel ring buffer interface
  [SCSI] sgiwd93: interfacing to wd33c93
  [SCSI] wd33c93: Fast SCSI with WD33C93B

1 files changed, 14 insertions, 0 deletions

diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index d6fe756eb371..0949145304ea 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);
 
@@ -654,6 +655,19 @@ static int scsi_probe_lun(struct scsi_device *sdev, unsigned char *inq_result,
          * short INQUIRY), an abort here prevents any further use of the
          * device, including spin up.
          *
+         * On the whole, the best approach seems to be to assume the first
+         * 36 bytes are valid no matter what the device says.  That's
+         * better than copying < 36 bytes to the inquiry-result buffer
+         * and displaying garbage for the Vendor, Product, or Revision
+         * strings.
+         */
+        if (sdev->inquiry_len < 36) {
+                printk(KERN_INFO "scsi scan: INQUIRY result too short (%d),"
+                                " using 36\n", sdev->inquiry_len);
+                sdev->inquiry_len = 36;
+        }
+
+        /*
          * Related to the above issue:
          *
          * XXX Devices (disk or all?) should be sent a TEST UNIT READY,