leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[media] media: au0828 enable the right media source when input changes

Browse Source 
Change vidioc_s_input() to enable the media source for the newly
selected input.

v4l2-core enables source before calling au0828's vidioc_s_input()
handler. Hence, when input selection changes, media source for the
newly selected input needs to be enabled.

Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
This commit is contained in:
Shuah Khan 2016-02-18 22:28:48 -02:00 committed by Mauro Carvalho Chehab
parent 37a35ced62
commit 050b6c98b4
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/media/usb/au0828/au0828-video.c
View File

@ -1453,6 +1453,7 @@ static void au0828_s_input(struct au0828_dev *dev, int index)
static int vidioc_s_input(struct file *file, void *priv, unsigned int index) static int vidioc_s_input(struct file *file, void *priv, unsigned int index)
{ {
struct au0828_dev *dev = video_drvdata(file); struct au0828_dev *dev = video_drvdata(file);
struct video_device *vfd = video_devdata(file);
dprintk(1, "VIDIOC_S_INPUT in function %s, input=%d\n", __func__, dprintk(1, "VIDIOC_S_INPUT in function %s, input=%d\n", __func__,
index); index);
@ -1465,7 +1466,14 @@ static int vidioc_s_input(struct file *file, void *priv, unsigned int index)
return 0; return 0;
au0828_s_input(dev, index); au0828_s_input(dev, index);
return 0;
/*
* Input has been changed. Disable the media source
* associated with the old input and enable source
* for the newly set input
*/
v4l_disable_media_source(vfd);
return v4l_enable_media_source(vfd);
} }
static int vidioc_enumaudio(struct file *file, void *priv, struct v4l2_audio *a) static int vidioc_enumaudio(struct file *file, void *priv, struct v4l2_audio *a)