commit b701061b39266b2a5879ace7afec01b830c848bf
author Linux Build Service Account <lnxbuild@localhost> Fri May 11 21:15:00 2012 -0700
committer QuIC Gerrit Code Review <code-review@localhost> Fri May 11 21:15:00 2012 -0700
tree 77b16ec0ec05d19597077763e1b58e7a81024299
parent ee5af5b57985e36602561675c7a16d5c78214336
parent c43396f4b1c9243d9bd26198e2aa45dc7645a933

Merge "msm: camera: Fix for ZSL and RAW snapshot issue" into msm-3.0

drivers/media/video/msm/msm_isp.c

diff --git a/drivers/media/video/msm/msm_isp.c b/drivers/media/video/msm/msm_isp.c
index 5b3101b..d678d86 100644
--- a/drivers/media/video/msm/msm_isp.c
+++ b/drivers/media/video/msm/msm_isp.c
@@ -618,6 +618,8 @@
 	switch (cfgcmd.cmd_type) {
 	case CMD_AXI_CFG_PRIM:
 	case CMD_AXI_CFG_SEC:
+	case CMD_AXI_CFG_ZSL:
+	case CMD_RAW_PICT_AXI_CFG:
 	case CMD_AXI_CFG_PRIM_ALL_CHNLS:
 	case CMD_AXI_CFG_PRIM|CMD_AXI_CFG_SEC:
 	case CMD_AXI_CFG_PRIM|CMD_AXI_CFG_SEC_ALL_CHNLS: