From bd74801f5af939b1005a9692d4d35677e27943d5 Mon Sep 17 00:00:00 2001
From: Prabhakar Lad <prabhakar.csengg@gmail.com>
Date: Fri, 20 Jul 2012 10:00:57 -0300
Subject: [PATCH] --- yaml --- r: 320670 b: refs/heads/master c:
 dcf4fc2e2efc605382563d6ab6ba1b6f15fa28a0 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 3a9c47e9652c..c2935c1e3d47 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a495ed77a2f582d860472cdfca815c1dc4a5d02
+refs/heads/master: dcf4fc2e2efc605382563d6ab6ba1b6f15fa28a0
diff --git a/trunk/drivers/media/video/davinci/vpbe_display.c b/trunk/drivers/media/video/davinci/vpbe_display.c
index e106b72810a9..f78ccc00bc4b 100644
--- a/trunk/drivers/media/video/davinci/vpbe_display.c
+++ b/trunk/drivers/media/video/davinci/vpbe_display.c
@@ -1083,7 +1083,7 @@ vpbe_display_s_dv_preset(struct file *file, void *priv,
 	}
 
 	/* Set the given standard in the encoder */
-	if (NULL != vpbe_dev->ops.s_dv_preset)
+	if (!vpbe_dev->ops.s_dv_preset)
 		return -EINVAL;
 
 	ret = vpbe_dev->ops.s_dv_preset(vpbe_dev, preset);