summaryrefslogtreecommitdiff
path: root/drivers/media/video/cx23885
diff options
context:
space:
mode:
authorSteven Toth <stoth@kernellabs.com>2012-01-06 11:55:32 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-01-10 23:38:21 -0200
commitc147f61083e3e4a9c2aaecaaed976502defc3b7d (patch)
tree2be9bbc0bf84178b357a5124795a27f4335e2500 /drivers/media/video/cx23885
parenta21df45df0c41f3eb7d0ec6676c7d14b20842bc2 (diff)
downloadlinux-c147f61083e3e4a9c2aaecaaed976502defc3b7d.tar.gz
[media] cx23885: Query the CX25840 during enum_input for status
We can pass a NO_SIGNAL video decoder state back to applications if it's available. Signed-off-by: Steven Toth <stoth@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx23885')
-rw-r--r--drivers/media/video/cx23885/cx23885-video.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c
index a01cd11da402..4bbf9bb97bde 100644
--- a/drivers/media/video/cx23885/cx23885-video.c
+++ b/drivers/media/video/cx23885/cx23885-video.c
@@ -1303,6 +1303,15 @@ int cx23885_enum_input(struct cx23885_dev *dev, struct v4l2_input *i)
if (INPUT(n)->type != CX23885_VMUX_TELEVISION)
i->audioset = 0x3;
+ if (dev->input == n) {
+ /* enum'd input matches our configured input.
+ * Ask the video decoder to process the call
+ * and give it an oppertunity to update the
+ * status field.
+ */
+ call_all(dev, video, g_input_status, &i->status);
+ }
+
return 0;
}