commit 72452631e2db3ca641414d05d2437144ac0366c6
author Terence Hampson <thampson@codeaurora.org> Mon Aug 13 12:32:24 2012 -0400
committer Terence Hampson <thampson@codeaurora.org> Thu Aug 23 17:22:28 2012 -0400
tree 8461ea3102c2480734872b45eb1880d58cb0ba1e
parent 40e489267e105f9b6da1ab7ed128f1cce9ea7924

msm: mpq8064: Fix false error reported by VP

Logical or where there should have been a bitwise or. Also ignoring
cadence change interrupt, because there is nothing for the driver
to do cadence change occurs.

Change-Id: I8a6214a66b67f6397a7b99ef54969761640abedf
Signed-off-by: Terence Hampson <thampson@codeaurora.org>

drivers/media/video/vcap_vp.c

diff --git a/drivers/media/video/vcap_vp.c b/drivers/media/video/vcap_vp.c
index 9f2ead4..ba053f2 100644
--- a/drivers/media/video/vcap_vp.c
+++ b/drivers/media/video/vcap_vp.c
@@ -320,7 +320,7 @@
 	}
 
 	dprintk(1, "%s: irq=0x%08x\n", __func__, irq);
-	if (!(irq & (VP_PIC_DONE || VP_MODE_CHANGE))) {
+	if (!(irq & (VP_PIC_DONE | VP_MODE_CHANGE))) {
 		writel_relaxed(irq, VCAP_VP_INT_CLEAR);
 		pr_err("VP IRQ shows some error\n");
 		return IRQ_HANDLED;
@@ -789,7 +789,7 @@
 		top_field = 1;
 #endif
 	vp_act->vp_state = VP_FRAME2;
-	writel_relaxed(0x01100101, VCAP_VP_INTERRUPT_ENABLE);
+	writel_relaxed(0x01100001, VCAP_VP_INTERRUPT_ENABLE);
 #ifdef TOP_FIELD_FIX
 	writel_iowmb(0x00000000 | vp_act->top_field << 0, VCAP_VP_CTRL);
 	writel_iowmb(0x00010000 | vp_act->top_field << 0, VCAP_VP_CTRL);
@@ -836,7 +836,7 @@
 #endif
 
 	/* Config VP & Enable Interrupt */
-	writel_relaxed(0x01100101, VCAP_VP_INTERRUPT_ENABLE);
+	writel_relaxed(0x01100001, VCAP_VP_INTERRUPT_ENABLE);
 #ifdef TOP_FIELD_FIX
 	writel_iowmb(0x00000000 | vp_act->top_field << 0, VCAP_VP_CTRL);
 	writel_iowmb(0x00010000 | vp_act->top_field << 0, VCAP_VP_CTRL);