commit a01f2b83f7d659476e7dc76bd204e29d4bf000b1
author Linux Build Service Account <lnxbuild@localhost> Tue Apr 02 00:18:08 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Apr 02 00:18:07 2013 -0700
tree e0847d314d38af17dc9539bcc117baf92ebe7184
parent a21e99ef0dc1f844a1b8b0d6e855d4e039317c19
parent 077bcf68c48fe9453111b3c7491b865e11f718ef

Merge "msm: wfd: Free ion handle on unmap"

drivers/media/platform/msm/wfd/enc-venus-subdev.c

diff --git a/drivers/media/platform/msm/wfd/enc-venus-subdev.c b/drivers/media/platform/msm/wfd/enc-venus-subdev.c
index 9ebf763..b719b3f 100644
--- a/drivers/media/platform/msm/wfd/enc-venus-subdev.c
+++ b/drivers/media/platform/msm/wfd/enc-venus-subdev.c
@@ -767,6 +767,7 @@
 	if (inst->secure)
 		msm_ion_unsecure_buffer(venc_ion_client, mregion->ion_handle);
 
+	ion_free(venc_ion_client, mregion->ion_handle);
 	return rc;
 }
 
@@ -1286,9 +1287,11 @@
 		return rc;
 	}
 
-	if (mregion->paddr)
+	if (mregion->paddr) {
 		ion_unmap_iommu(mmap->ion_client, mregion->ion_handle,
 			domain, partition);
+		mregion->paddr = NULL;
+	}
 
 	if (inst->secure)
 		msm_ion_unsecure_buffer(mmap->ion_client, mregion->ion_handle);