Piteball
/
android_kernel_samsung_msm8976
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "iommu: Fix __msm_map_iommu_common()"

This commit is contained in:
Linux Build Service Account 2015-04-02 04:13:02 -07:00 committed by Gerrit - the friendly Code Review server
parent 5fc4d8ed09 141fb52e60
commit 9e67da392a
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/iommu/msm_iommu_mapping.c
View File

@ -433,6 +433,7 @@ static int __msm_map_iommu_common(
iommu_meta = msm_iommu_meta_create(dma_buf, table, size);
if (IS_ERR(iommu_meta)) {
mutex_unlock(&msm_iommu_map_mutex);
ret = PTR_ERR(iommu_meta);
goto out;
}
@ -487,7 +488,7 @@ static int __msm_map_iommu_common(
out_unlock:
mutex_unlock(&iommu_meta->lock);
out:
if (iommu_meta)
if (!IS_ERR(iommu_meta))
msm_iommu_meta_put(iommu_meta);
return ret;