From e88c9eb73ee44c015d7459d4e702943c3aec6aa3 Mon Sep 17 00:00:00 2001 From: Prabhakar Lad Date: Fri, 20 Jul 2012 09:56:48 -0300 Subject: [PATCH] --- yaml --- r: 320674 b: refs/heads/master c: 4927c3f1c48fff3473b684d2dac5b4e432861b4e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/davinci/vpbe_display.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 0567757fad4f..de1eb03b2879 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 53aa3b19c584faf0ea6e4cc910a9ff4ac31e2390 +refs/heads/master: 4927c3f1c48fff3473b684d2dac5b4e432861b4e diff --git a/trunk/drivers/media/video/davinci/vpbe_display.c b/trunk/drivers/media/video/davinci/vpbe_display.c index f78ccc00bc4b..6fe7034bea7c 100644 --- a/trunk/drivers/media/video/davinci/vpbe_display.c +++ b/trunk/drivers/media/video/davinci/vpbe_display.c @@ -1517,6 +1517,8 @@ static int vpbe_display_g_register(struct file *file, void *priv, struct v4l2_dbg_register *reg) { struct v4l2_dbg_match *match = ®->match; + struct vpbe_fh *fh = file->private_data; + struct vpbe_device *vpbe_dev = fh->disp_dev->vpbe_dev; if (match->type >= 2) { v4l2_subdev_call(vpbe_dev->venc,