Merge "msm: camera: Fix crash issue while enabling regular stats" into msm-3.0
diff --git a/drivers/media/video/msm/msm_isp.c b/drivers/media/video/msm/msm_isp.c
index 16964b2..fdd1f0e 100644
--- a/drivers/media/video/msm/msm_isp.c
+++ b/drivers/media/video/msm/msm_isp.c
@@ -362,6 +362,35 @@
stats.buffer = msm_pmem_stats_ptov_lookup(&pmctl->sync,
isp_stats->buffer,
&(stats.fd));
+ switch (isp_stats->id) {
+ case MSG_ID_STATS_AEC:
+ stats.aec.buff = stats.buffer;
+ stats.aec.fd = stats.fd;
+ break;
+ case MSG_ID_STATS_AF:
+ stats.af.buff = stats.buffer;
+ stats.af.fd = stats.fd;
+ break;
+ case MSG_ID_STATS_AWB:
+ stats.awb.buff = stats.buffer;
+ stats.awb.fd = stats.fd;
+ break;
+ case MSG_ID_STATS_IHIST:
+ stats.ihist.buff = stats.buffer;
+ stats.ihist.fd = stats.fd;
+ break;
+ case MSG_ID_STATS_RS:
+ stats.rs.buff = stats.buffer;
+ stats.rs.fd = stats.fd;
+ break;
+ case MSG_ID_STATS_CS:
+ stats.cs.buff = stats.buffer;
+ stats.cs.fd = stats.fd;
+ break;
+ default:
+ pr_err("%s: Invalid msg type", __func__);
+ break;
+ }
if (!stats.buffer) {
pr_err("%s: msm_pmem_stats_ptov_lookup error\n",
__func__);