Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind...

[pandora-kernel.git] / drivers / media / video / davinci / vpif_display.c

diff --git a/drivers/media/video/davinci/vpif_display.c b/drivers/media/video/davinci/vpif_display.c
index 13c3a1b..da07607 100644 (file)
--- a/drivers/media/video/davinci/vpif_display.c
+++ b/drivers/media/video/davinci/vpif_display.c
@@ -384,7 +384,7 @@ static int vpif_get_std_info(struct channel_obj *ch)
        int index;
 
        std_info->stdid = vid_ch->stdid;
-       if (!std_info)
+       if (!std_info->stdid)
                return -1;
 
        for (index = 0; index < ARRAY_SIZE(ch_params); index++) {
@@ -671,7 +671,7 @@ static int vpif_release(struct file *filep)
                ch->initialized = 0;
 
        /* Close the priority */
-       v4l2_prio_close(&ch->prio, &fh->prio);
+       v4l2_prio_close(&ch->prio, fh->prio);
        filep->private_data = NULL;
        fh->initialized = 0;
        kfree(fh);
@@ -753,7 +753,7 @@ static int vpif_s_fmt_vid_out(struct file *file, void *priv,
                }
 
                /* Check for the priority */
-               ret = v4l2_prio_check(&ch->prio, &fh->prio);
+               ret = v4l2_prio_check(&ch->prio, fh->prio);
                if (0 != ret)
                        return ret;
                fh->initialized = 1;