Commit dbcec2e6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull SCSI fixes from James Bottomley:
 "This is mostly a set of minor and obvious fixes (three in one of the
  new drivers).

  The only substantial change is to move the ufs to the blk-mq now that
  the merge window fixed the suspend/resume issues with blk-mq"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: qla2xxx: Initialize port speed to avoid setting lower speed
  Revert "scsi: ufs: Disable blk-mq for now"
  scsi: NCR5380: Return false instead of NULL
  scsi: qla2xxx: Fix a typo in MODULE_PARM_DESC
  scsi: hisi_sas: Remove set but not used variable 'dq_list'
  scsi: myrs: only build on little-endian platforms
  scsi: myrs: avoid stack overflow warning
  scsi: lpfc: fix remoteport access
  scsi: myrb: fix sprintf buffer overflow warning
  scsi: target/core: Avoid that a kernel oops is triggered when COMPARE AND WRITE fails
parents b7bbf993 f635e48e

drivers/scsi/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -578,6 +578,7 @@ config SCSI_MYRB 
config SCSI_MYRS

config SCSI_MYRS

	tristate "Mylex DAC960/DAC1100 PCI RAID Controller (SCSI Interface)"

	tristate "Mylex DAC960/DAC1100 PCI RAID Controller (SCSI Interface)"

	depends on PCI

	depends on PCI

	depends on !CPU_BIG_ENDIAN || COMPILE_TEST

	select RAID_ATTRS

	select RAID_ATTRS

	help

	help

	  This driver adds support for the Mylex DAC960, AcceleRAID, and

	  This driver adds support for the Mylex DAC960, AcceleRAID, and

drivers/scsi/NCR5380.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1198,7 +1198,7 @@ static bool NCR5380_select(struct Scsi_Host *instance, struct scsi_cmnd *cmd) 




out:

out:

	if (!hostdata->selecting)

	if (!hostdata->selecting)

		return NULL;

		return false;

	hostdata->selecting = NULL;

	hostdata->selecting = NULL;

	return ret;

	return ret;

}

}

drivers/scsi/hisi_sas/hisi_sas_v1_hw.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -904,11 +904,9 @@ static void start_delivery_v1_hw(struct hisi_sas_dq *dq) 
{

{

	struct hisi_hba *hisi_hba = dq->hisi_hba;

	struct hisi_hba *hisi_hba = dq->hisi_hba;

	struct hisi_sas_slot *s, *s1, *s2 = NULL;

	struct hisi_sas_slot *s, *s1, *s2 = NULL;

	struct list_head *dq_list;

	int dlvry_queue = dq->id;

	int dlvry_queue = dq->id;

	int wp;

	int wp;





	dq_list = &dq->list;

	list_for_each_entry_safe(s, s1, &dq->list, delivery) {

	list_for_each_entry_safe(s, s1, &dq->list, delivery) {

		if (!s->ready)

		if (!s->ready)

			break;

			break;

drivers/scsi/hisi_sas/hisi_sas_v2_hw.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -1670,11 +1670,9 @@ static void start_delivery_v2_hw(struct hisi_sas_dq *dq) 
{

{

	struct hisi_hba *hisi_hba = dq->hisi_hba;

	struct hisi_hba *hisi_hba = dq->hisi_hba;

	struct hisi_sas_slot *s, *s1, *s2 = NULL;

	struct hisi_sas_slot *s, *s1, *s2 = NULL;

	struct list_head *dq_list;

	int dlvry_queue = dq->id;

	int dlvry_queue = dq->id;

	int wp;

	int wp;





	dq_list = &dq->list;

	list_for_each_entry_safe(s, s1, &dq->list, delivery) {

	list_for_each_entry_safe(s, s1, &dq->list, delivery) {

		if (!s->ready)

		if (!s->ready)

			break;

			break;

drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -886,11 +886,9 @@ static void start_delivery_v3_hw(struct hisi_sas_dq *dq) 
{

{

	struct hisi_hba *hisi_hba = dq->hisi_hba;

	struct hisi_hba *hisi_hba = dq->hisi_hba;

	struct hisi_sas_slot *s, *s1, *s2 = NULL;

	struct hisi_sas_slot *s, *s1, *s2 = NULL;

	struct list_head *dq_list;

	int dlvry_queue = dq->id;

	int dlvry_queue = dq->id;

	int wp;

	int wp;





	dq_list = &dq->list;

	list_for_each_entry_safe(s, s1, &dq->list, delivery) {

	list_for_each_entry_safe(s, s1, &dq->list, delivery) {

		if (!s->ready)

		if (!s->ready)

			break;

			break;

CRA Git | Maintained and supported by SUSTech CRA and CCSE