Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 285801
b: refs/heads/master
c: c147f61
h: refs/heads/master
i:
  285799: 70efd3f
v: v3
  • Loading branch information
Steven Toth authored and Mauro Carvalho Chehab committed Jan 11, 2012
1 parent 5b7c947 commit 818c898
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a21df45df0c41f3eb7d0ec6676c7d14b20842bc2
refs/heads/master: c147f61083e3e4a9c2aaecaaed976502defc3b7d
9 changes: 9 additions & 0 deletions trunk/drivers/media/video/cx23885/cx23885-video.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit 818c898

Please sign in to comment.