Commit 9904468f 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:
 "Five fairly minor fixes and spelling updates, all in drivers. Even
  though the ufs fix is in tracing, it's a potentially exploitable use
  beyond end of array bug"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: csiostor: Add module softdep on cxgb4
  scsi: qla2xxx: Fix excessive messages during device logout
  scsi: virtio_scsi: Fix spelling mistake "Unsupport" -> "Unsupported"
  scsi: ses: Fix unsigned comparison with less than zero
  scsi: ufs: Fix illegal offset in UPIU event trace
parents ab2a7a35 79a74822

drivers/scsi/csiostor/csio_init.c

+1 −0
Original line number Diff line number Diff line
@@ -1254,3 +1254,4 @@ MODULE_DEVICE_TABLE(pci, csio_pci_tbl); 
MODULE_VERSION(CSIO_DRV_VERSION);

MODULE_FIRMWARE(FW_FNAME_T5);

MODULE_FIRMWARE(FW_FNAME_T6);

MODULE_SOFTDEP("pre: cxgb4");

drivers/scsi/qla2xxx/qla_isr.c

+2 −2
Original line number Diff line number Diff line
@@ -2634,7 +2634,7 @@ static void qla24xx_nvme_iocb_entry(scsi_qla_host_t *vha, struct req_que *req, 
	}



	if (unlikely(logit))

		ql_log(ql_log_warn, fcport->vha, 0x5060,

		ql_log(ql_dbg_io, fcport->vha, 0x5060,

		   "NVME-%s ERR Handling - hdl=%x status(%x) tr_len:%x resid=%x  ox_id=%x\n",

		   sp->name, sp->handle, comp_status,

		   fd->transferred_length, le32_to_cpu(sts->residual_len),
@@ -3491,7 +3491,7 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt) 


out:

	if (logit)

		ql_log(ql_log_warn, fcport->vha, 0x3022,

		ql_log(ql_dbg_io, fcport->vha, 0x3022,

		       "FCP command status: 0x%x-0x%x (0x%x) nexus=%ld:%d:%llu portid=%02x%02x%02x oxid=0x%x cdb=%10phN len=0x%x rsp_info=0x%x resid=0x%x fw_resid=0x%x sp=%p cp=%p.\n",

		       comp_status, scsi_status, res, vha->host_no,

		       cp->device->id, cp->device->lun, fcport->d_id.b.domain,

drivers/scsi/ses.c

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static int ses_recv_diag(struct scsi_device *sdev, int page_code, 
static int ses_send_diag(struct scsi_device *sdev, int page_code,

			 void *buf, int bufflen)

{

	u32 result;

	int result;



	unsigned char cmd[] = {

		SEND_DIAGNOSTIC,

drivers/scsi/ufs/ufshcd.c

+1 −2
Original line number Diff line number Diff line
@@ -318,8 +318,7 @@ static void ufshcd_add_query_upiu_trace(struct ufs_hba *hba, 
static void ufshcd_add_tm_upiu_trace(struct ufs_hba *hba, unsigned int tag,

				     enum ufs_trace_str_t str_t)

{

	int off = (int)tag - hba->nutrs;

	struct utp_task_req_desc *descp = &hba->utmrdl_base_addr[off];

	struct utp_task_req_desc *descp = &hba->utmrdl_base_addr[tag];



	if (!trace_ufshcd_upiu_enabled())

		return;

drivers/scsi/virtio_scsi.c

+2 −2
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ static void virtscsi_handle_transport_reset(struct virtio_scsi *vscsi, 
		}

		break;

	default:

		pr_info("Unsupport virtio scsi event reason %x\n", event->reason);

		pr_info("Unsupported virtio scsi event reason %x\n", event->reason);

	}

}
@@ -392,7 +392,7 @@ static void virtscsi_handle_event(struct work_struct *work) 
		virtscsi_handle_param_change(vscsi, event);

		break;

	default:

		pr_err("Unsupport virtio scsi event %x\n", event->event);

		pr_err("Unsupported virtio scsi event %x\n", event->event);

	}

	virtscsi_kick_event(vscsi, event_node);

}