diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-03-22 14:33:04 +0300 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2016-03-22 14:33:04 +0300 |
| commit | c6986be4f9e9c02e63619efd7049ea0cdcf862f6 (patch) | |
| tree | 1cbe8f947aaa0ba2d4e08ec164a0497c36d5da82 /drivers/scsi/megaraid/megaraid_sas_base.c | |
| parent | b86c75fda662506fe6e55d61994482fb4a704f5f (diff) | |
| parent | ba08311647892cc7912de74525fd78416caf544a (diff) | |
| download | linux-c6986be4f9e9c02e63619efd7049ea0cdcf862f6.tar.xz | |
Merge remote-tracking branch 'mkp-scsi/4.6/scsi-fixes' into misc
Diffstat (limited to 'drivers/scsi/megaraid/megaraid_sas_base.c')
| -rw-r--r-- | drivers/scsi/megaraid/megaraid_sas_base.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c index 69d375b8f2e1..e6ebc7ae2df1 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c @@ -6656,12 +6656,13 @@ out: } for (i = 0; i < ioc->sge_count; i++) { - if (kbuff_arr[i]) + if (kbuff_arr[i]) { dma_free_coherent(&instance->pdev->dev, le32_to_cpu(kern_sge32[i].length), kbuff_arr[i], le32_to_cpu(kern_sge32[i].phys_addr)); kbuff_arr[i] = NULL; + } } megasas_return_cmd(instance, cmd); |