summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/em28xx/em28xx-video.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-02-06 18:34:13 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-02-18 11:15:16 -0300
commit00b8730f5db19f9ea0985d7f14f869df79a0bf76 (patch)
tree043a721acdae940c0f26fadce689a3e0fb421655 /drivers/media/video/em28xx/em28xx-video.c
parent0df8130fe80ebde052516c1d729aa5d1c69ebc5c (diff)
downloadblackbird-op-linux-00b8730f5db19f9ea0985d7f14f869df79a0bf76.tar.gz
blackbird-op-linux-00b8730f5db19f9ea0985d7f14f869df79a0bf76.zip
V4L/DVB (7163): em28xx: makes audio settings more stable
Improves audio configurations on em28xx: - mutes audio before changing amux; - adds a delay after setting audio src; - waits up to 50ms for ac97 busy. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-video.c')
-rw-r--r--drivers/media/video/em28xx/em28xx-video.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index f69f591eeaf6..eeda3b2faec8 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -189,7 +189,7 @@ static void video_mux(struct em28xx *dev, int index)
em28xx_i2c_call_clients(dev, VIDIOC_INT_S_AUDIO_ROUTING, &route);
}
- em28xx_set_audio_source(dev);
+ em28xx_audio_analog_set(dev);
}
/* Usage lock check functions */
@@ -837,7 +837,6 @@ static int em28xx_reg_len(int reg)
case AC97LSB_REG:
case HSCALELOW_REG:
case VSCALELOW_REG:
-
return 2;
default:
return 1;
OpenPOWER on IntegriCloud