diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-08-03 21:12:32 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-03 21:12:32 -0700 |
| commit | eff7f7ed60c4ef08505f5515ed46291674bd8a48 (patch) | |
| tree | f8e9c94c9862c501e96c8650928efaaf52867361 | |
| parent | 059df41e860f67a9ba59ff4af2c95d754d6e4a28 (diff) | |
| parent | 4f319d4ecdaa5ec6c5344146267239790ae8038c (diff) | |
Merge "msm: camera_v2: Fix a return code issue in smmu mapping"
| -rw-r--r-- | drivers/media/platform/msm/camera_v2/common/cam_smmu_api.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/platform/msm/camera_v2/common/cam_smmu_api.c b/drivers/media/platform/msm/camera_v2/common/cam_smmu_api.c index 6b43efce453f..03a61407aef8 100644 --- a/drivers/media/platform/msm/camera_v2/common/cam_smmu_api.c +++ b/drivers/media/platform/msm/camera_v2/common/cam_smmu_api.c @@ -788,8 +788,9 @@ static int cam_smmu_map_buffer_and_add_to_list(int idx, int ion_fd, rc = msm_dma_map_sg_lazy(iommu_cb_set.cb_info[idx].dev, table->sgl, table->nents, dma_dir, buf); - if (!rc) { + if (rc != table->nents) { pr_err("Error: msm_dma_map_sg_lazy failed\n"); + rc = -ENOMEM; goto err_unmap_sg; } |