From 0163b5286ccebfe66cbc6592aa17f690e60b30fb Mon Sep 17 00:00:00 2001
From: Manjunath Hadli <manjunath.hadli@ti.com>
Date: Fri, 13 Apr 2012 04:47:17 -0300
Subject: [PATCH] --- yaml --- r: 320610 b: refs/heads/master c:
 3bc1953b22ba11922190bc76682ece431b6eefff h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/media/video/davinci/vpif.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index be3773fd611a..09c9e2fc2000 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0316b89ae0de139875594d7fa0527cb5af69bd69
+refs/heads/master: 3bc1953b22ba11922190bc76682ece431b6eefff
diff --git a/trunk/drivers/media/video/davinci/vpif.c b/trunk/drivers/media/video/davinci/vpif.c
index 774bcd3cf50c..8c4ff14377ad 100644
--- a/trunk/drivers/media/video/davinci/vpif.c
+++ b/trunk/drivers/media/video/davinci/vpif.c
@@ -346,7 +346,7 @@ static void config_vpif_params(struct vpif_params *vpifparams,
 
 			value = regr(reg);
 			/* Set data width */
-			value &= ((~(unsigned int)(0x3)) <<
+			value &= ~(0x3u <<
 					VPIF_CH_DATA_WIDTH_BIT);
 			value |= ((vpifparams->params.data_sz) <<
 						     VPIF_CH_DATA_WIDTH_BIT);