Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef55e513 authored Jul 06, 2016 by Joe Carnuccio Committed by Martin K. Petersen Jul 15, 2016

qla2xxx: Correction to function qla26xx_dport_diagnostics().



Signed-off-by: Joe Carnuccio <joe.carnuccio@qlogic.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@qlogic.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

parent 41233cd3

drivers/scsi/qla2xxx/qla_dbg.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -14,7 +14,7 @@
	* \| Module Init and Probe \| 0x0191 \| 0x0146 \|		* \| Module Init and Probe \| 0x0191 \| 0x0146 \|
	* \| \| \| 0x015b-0x0160 \|		* \| \| \| 0x015b-0x0160 \|
	* \| \| \| 0x016e \|		* \| \| \| 0x016e \|
	* \| Mailbox commands \| 0x1196 \| \|		* \| Mailbox commands \| 0x1196 \| 0x1193 \|
	* \| \| \| \|		* \| \| \| \|
	* \| Device Discovery \| 0x2003 \| 0x2016 \|		* \| Device Discovery \| 0x2003 \| 0x2016 \|
	* \| \| \| 0x2011-0x2012, \|		* \| \| \| 0x2011-0x2012, \|

drivers/scsi/qla2xxx/qla_isr.c

+3 −5

Original line number	Original line	Diff line number	Diff line
	@@ -1159,13 +1159,11 @@ qla2x00_async_event(scsi_qla_host_t vha, struct rsp_que rsp, uint16_t *mb)

	case MBA_DPORT_DIAGNOSTICS:		case MBA_DPORT_DIAGNOSTICS:
	ql_dbg(ql_dbg_async, vha, 0x5052,		ql_dbg(ql_dbg_async, vha, 0x5052,
	"D-Port Diagnostics: %04x result=%s index=%u size=%u\n",		"D-Port Diagnostics: %04x result=%s\n",
	mb[0],		mb[0],
	mb[1] == 0 ? "start" :		mb[1] == 0 ? "start" :
	mb[1] == 1 ? "done (ok)" :		mb[1] == 1 ? "done (pass)" :
	mb[1] == 2 ? "done (error)" : "other",		mb[1] == 2 ? "done (error)" : "other");
	LSB(mb[2]),
	mb[3]);
	break;		break;

	case MBA_TEMPERATURE_ALERT:		case MBA_TEMPERATURE_ALERT:

drivers/scsi/qla2xxx/qla_mbx.c

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -5764,11 +5764,6 @@ qla26xx_dport_diagnostics(scsi_qla_host_t *vha,
	ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1192,		ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1192,
	"Entered %s.\n", __func__);		"Entered %s.\n", __func__);

	if (size < 1024) {
	ql_log(ql_log_warn, vha, 0x1193, "Failed insufficient size.\n");
	return QLA_FUNCTION_PARAMETER_ERROR;
	}

	dd_dma = dma_map_single(&vha->hw->pdev->dev,		dd_dma = dma_map_single(&vha->hw->pdev->dev,
	dd_buf, size, DMA_FROM_DEVICE);		dd_buf, size, DMA_FROM_DEVICE);
	if (!dd_dma) {		if (!dd_dma) {