Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull SCSI fixes from James Bottomley:
 "Nine changes, eight to drivers (qla2xxx, hpsa, lpfc, alua, ch,
  53c710[x2], target) and one core change that tries to close a race
  between sysfs delete and module removal"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: lpfc: remove left-over BUILD_NVME defines
  scsi: core: try to get module before removing device
  scsi: hpsa: add missing hunks in reset-patch
  scsi: target: core: Do not overwrite CDB byte 1
  scsi: ch: Make it possible to open a ch device multiple times again
  scsi: fix kconfig dependency warning related to 53C700_LE_ON_BE
  scsi: sni_53c710: fix compilation error
  scsi: scsi_dh_alua: handle RTPG sense code correctly during state transitions
  scsi: qla2xxx: fix a potential NULL pointer dereference

1 files changed, 4 insertions, 0 deletions

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index ac39ed79ccaa..216e557f703e 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -5477,6 +5477,8 @@ static int hpsa_ciss_submit(struct ctlr_info *h,
                 return SCSI_MLQUEUE_HOST_BUSY;
         }
 
+        c->device = dev;
+
         enqueue_cmd_and_start_io(h, c);
         /* the cmd'll come back via intr handler in complete_scsi_command()  */
         return 0;
@@ -5548,6 +5550,7 @@ static int hpsa_ioaccel_submit(struct ctlr_info *h,
                 hpsa_cmd_init(h, c->cmdindex, c);
                 c->cmd_type = CMD_SCSI;
                 c->scsi_cmd = cmd;
+                c->device = dev;
                 rc = hpsa_scsi_ioaccel_raid_map(h, c);
                 if (rc < 0)     /* scsi_dma_map failed. */
                         rc = SCSI_MLQUEUE_HOST_BUSY;
@@ -5555,6 +5558,7 @@ static int hpsa_ioaccel_submit(struct ctlr_info *h,
                 hpsa_cmd_init(h, c->cmdindex, c);
                 c->cmd_type = CMD_SCSI;
                 c->scsi_cmd = cmd;
+                c->device = dev;
                 rc = hpsa_scsi_ioaccel_direct_map(h, c);
                 if (rc < 0)     /* scsi_dma_map failed. */
                         rc = SCSI_MLQUEUE_HOST_BUSY;