diff options
| author | David S. Miller <davem@davemloft.net> | 2017-06-15 11:31:37 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-15 11:59:32 -0400 |
| commit | 0ddead90b223faae475f3296a50bf574b7f7c69a (patch) | |
| tree | e729c7fcdc7e3697f7fae2f3028ed0d11931c425 /drivers/scsi/qla2xxx/qla_target.c | |
| parent | f7aec129a356ad049edddcb7e77b04a474fcf41f (diff) | |
| parent | a090bd4ff8387c409732a8e059fbf264ea0bdd56 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflicts were two cases of overlapping changes in
batman-adv and the qed driver.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_target.c')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_target.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/scsi/qla2xxx/qla_target.c b/drivers/scsi/qla2xxx/qla_target.c index 0e03ca2ab3e5..e766d8412384 100644 --- a/drivers/scsi/qla2xxx/qla_target.c +++ b/drivers/scsi/qla2xxx/qla_target.c @@ -2245,11 +2245,13 @@ static void qlt_unmap_sg(struct scsi_qla_host *vha, struct qla_tgt_cmd *cmd) pci_unmap_sg(ha->pdev, cmd->prot_sg, cmd->prot_sg_cnt, cmd->dma_data_direction); + if (!cmd->ctx) + return; + if (cmd->ctx_dsd_alloced) - qla2x00_clean_dsd_pool(ha, NULL, cmd); + qla2x00_clean_dsd_pool(ha, cmd->ctx); - if (cmd->ctx) - dma_pool_free(ha->dl_dma_pool, cmd->ctx, cmd->ctx->crc_ctx_dma); + dma_pool_free(ha->dl_dma_pool, cmd->ctx, cmd->ctx->crc_ctx_dma); } static int qlt_check_reserve_free_req(struct scsi_qla_host *vha, |