Change au0828 to check if tuner is free or not
before changing tuner configuration.

vidioc_g_tuner(), and au0828_v4l2_close() now call
v4l-core interface v4l_enable_media_source() before
changing tuner configuration.

Signed-off-by: Shuah Khan <shua...@osg.samsung.com>
---
 drivers/media/usb/au0828/au0828-video.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/drivers/media/usb/au0828/au0828-video.c 
b/drivers/media/usb/au0828/au0828-video.c
index 81952c8..8087215 100644
--- a/drivers/media/usb/au0828/au0828-video.c
+++ b/drivers/media/usb/au0828/au0828-video.c
@@ -1006,8 +1006,12 @@ static int au0828_v4l2_close(struct file *filp)
                goto end;
 
        if (dev->users == 1) {
-               /* Save some power by putting tuner to sleep */
-               v4l2_device_call_all(&dev->v4l2_dev, 0, core, s_power, 0);
+               /* Save some power by putting tuner to sleep, if it is free */
+               /* What happens when radio is using tuner?? */
+               ret = v4l_enable_media_source(vdev);
+               if (ret == 0)
+                       v4l2_device_call_all(&dev->v4l2_dev, 0, core,
+                                            s_power, 0);
                dev->std_set_in_tuner_core = 0;
 
                /* When close the device, set the usb intf0 into alt0 to free
@@ -1408,10 +1412,16 @@ static int vidioc_s_audio(struct file *file, void 
*priv, const struct v4l2_audio
 static int vidioc_g_tuner(struct file *file, void *priv, struct v4l2_tuner *t)
 {
        struct au0828_dev *dev = video_drvdata(file);
+       struct video_device *vfd = video_devdata(file);
+       int ret;
 
        if (t->index != 0)
                return -EINVAL;
 
+       ret = v4l_enable_media_source(vfd);
+       if (ret)
+               return ret;
+
        dprintk(1, "%s called std_set %d dev_state %d\n", __func__,
                dev->std_set_in_tuner_core, dev->dev_state);
 
-- 
2.5.0

Reply via email to