V4L/DVB (9672): Allow opening more than one output at the same time

Some devices use more than one AC97 outputs. This patch allows such
devices to properly work.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index bea74fd9a520..b262091415bb 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -568,6 +568,9 @@ static void video_mux(struct em28xx *dev, int index)
         dev->ctl_ainput = INPUT(index)->amux;
         dev->ctl_aoutput = INPUT(index)->aout;
 
+        if (!dev->ctl_aoutput)
+                dev->ctl_aoutput = EM28XX_AOUT_MASTER;
+
         em28xx_i2c_call_clients(dev, VIDIOC_INT_S_VIDEO_ROUTING, &route);
 
         if (dev->has_msp34xx) {
@@ -972,6 +975,9 @@ static int vidioc_s_audio(struct file *file, void *priv, struct v4l2_audio *a)
 
         dev->ctl_ainput = INPUT(a->index)->amux;
         dev->ctl_aoutput = INPUT(a->index)->aout;
+
+        if (!dev->ctl_aoutput)
+                dev->ctl_aoutput = EM28XX_AOUT_MASTER;
         return 0;
 }