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

Pull SCSI updates from James Bottomley:
 "This patch consists of the usual driver updates (qla2xxx, qla4xxx,
  lpfc, be2iscsi, fnic, ufs, NCR5380) The NCR5380 is the addition to
  maintained status of a long neglected driver for older hardware.  In
  addition there are a lot of minor fixes and cleanups and some more
  updates to make scsi mq ready"

* tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (130 commits)
  include/scsi/osd_protocol.h: remove unnecessary __constant
  mvsas: Recognise device/subsystem 9485/9485 as 88SE9485
  Revert "be2iscsi: Fix processing cqe for cxn whose endpoint is freed"
  mptfusion: fix msgContext in mptctl_hp_hostinfo
  acornscsi: remove linked command support
  scsi/NCR5380: dprintk macro
  fusion: Remove use of DEF_SCSI_QCMD
  fusion: Add free msg frames to the head, not tail of list
  mpt2sas: Add free smids to the head, not tail of list
  mpt2sas: Remove use of DEF_SCSI_QCMD
  mpt2sas: Remove uses of serial_number
  mpt3sas: Remove use of DEF_SCSI_QCMD
  mpt3sas: Remove uses of serial_number
  qla2xxx: Use kmemdup instead of kmalloc + memcpy
  qla4xxx: Use kmemdup instead of kmalloc + memcpy
  qla2xxx: fix incorrect debug printk
  be2iscsi: Bump the driver version
  be2iscsi: Fix processing cqe for cxn whose endpoint is freed
  be2iscsi: Fix destroy MCC-CQ before MCC-EQ is destroyed
  be2iscsi: Fix memory corruption in MBX path
  ...

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.c b/drivers/scsi/mpt2sas/mpt2sas_base.c
index bde63f7452bd..8b88118e20e6 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_base.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_base.c
@@ -1739,14 +1739,14 @@ mpt2sas_base_free_smid(struct MPT2SAS_ADAPTER *ioc, u16 smid)
                         list_for_each_entry_safe(chain_req, next,
                             &ioc->scsi_lookup[i].chain_list, tracker_list) {
                                 list_del_init(&chain_req->tracker_list);
-                                list_add_tail(&chain_req->tracker_list,
+                                list_add(&chain_req->tracker_list,
                                     &ioc->free_chain_list);
                         }
                 }
                 ioc->scsi_lookup[i].cb_idx = 0xFF;
                 ioc->scsi_lookup[i].scmd = NULL;
                 ioc->scsi_lookup[i].direct_io = 0;
-                list_add_tail(&ioc->scsi_lookup[i].tracker_list,
+                list_add(&ioc->scsi_lookup[i].tracker_list,
                     &ioc->free_list);
                 spin_unlock_irqrestore(&ioc->scsi_lookup_lock, flags);
 
@@ -1764,13 +1764,13 @@ mpt2sas_base_free_smid(struct MPT2SAS_ADAPTER *ioc, u16 smid)
                 /* hi-priority */
                 i = smid - ioc->hi_priority_smid;
                 ioc->hpr_lookup[i].cb_idx = 0xFF;
-                list_add_tail(&ioc->hpr_lookup[i].tracker_list,
+                list_add(&ioc->hpr_lookup[i].tracker_list,
                     &ioc->hpr_free_list);
         } else if (smid <= ioc->hba_queue_depth) {
                 /* internal queue */
                 i = smid - ioc->internal_smid;
                 ioc->internal_lookup[i].cb_idx = 0xFF;
-                list_add_tail(&ioc->internal_lookup[i].tracker_list,
+                list_add(&ioc->internal_lookup[i].tracker_list,
                     &ioc->internal_free_list);
         }
         spin_unlock_irqrestore(&ioc->scsi_lookup_lock, flags);