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);