Merge "msm-camera: Added the NULL check in gemini driver."
diff --git a/drivers/media/video/msm/gemini/msm_gemini_platform.c b/drivers/media/video/msm/gemini/msm_gemini_platform.c
index d5a8098..2704ed2 100644
--- a/drivers/media/video/msm/gemini/msm_gemini_platform.c
+++ b/drivers/media/video/msm/gemini/msm_gemini_platform.c
@@ -32,6 +32,8 @@
struct ion_handle **ionhandle)
{
#ifdef CONFIG_MSM_MULTIMEDIA_USE_ION
+ if(*ionhandle == NULL)
+ return;
ion_unmap_iommu(gemini_client, *ionhandle, CAMERA_DOMAIN, GEN_POOL);
ion_free(gemini_client, *ionhandle);
*ionhandle = NULL;
diff --git a/drivers/media/video/msm/gemini/msm_gemini_sync.c b/drivers/media/video/msm/gemini/msm_gemini_sync.c
index c1713be..c333973 100644
--- a/drivers/media/video/msm/gemini/msm_gemini_sync.c
+++ b/drivers/media/video/msm/gemini/msm_gemini_sync.c
@@ -587,6 +587,9 @@
(int) buf_cmd.vaddr, buf_cmd.y_len, pgmn_dev->op_mode);
if (pgmn_dev->op_mode == MSM_GEMINI_MODE_REALTIME_ENCODE) {
+ if(buf_cmd.y_off == 0)
+ return 0;
+
rc = msm_iommu_map_contig_buffer(
(unsigned long)buf_cmd.y_off, CAMERA_DOMAIN, GEN_POOL,
((buf_cmd.y_len + buf_cmd.cbcr_len + 4095) & (~4095)),