Commit 131736d3 authored Aug 26, 2005 by Andrew Vasquez Committed by James Bottomley Sep 04, 2005

[SCSI] qla2xxx: Remove redundant call to pci_unmap_sg().



In a corner-case failure where the request-q does not
contain enough entries for a given request, pci_unmap_sg()
would be called twice.  Remove direct call and let the
failure-path logic handle the unmapping.

Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

parent c32c4cb9

drivers/scsi/qla2xxx/qla_iocb.c

+1 −5

Original line number	Diff line number	Diff line
		@@ -810,12 +810,8 @@ qla24xx_start_scsi(srb_t *sp)
		ha->req_q_cnt = ha->request_q_length -
		(ha->req_ring_index - cnt);
		}
		if (ha->req_q_cnt < (req_cnt + 2)) {
		if (cmd->use_sg)
		pci_unmap_sg(ha->pdev, sg, cmd->use_sg,
		cmd->sc_data_direction);
		if (ha->req_q_cnt < (req_cnt + 2))
		goto queuing_error;
		}

		/* Build command packet. */
		ha->current_outstanding_cmd = handle;