summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorDouglas Schilling Landgraf <dougsland@linuxtv.org>2008-09-28 00:37:48 -0400
committerDouglas Schilling Landgraf <dougsland@linuxtv.org>2008-09-28 00:37:48 -0400
commit8c77729bce0b4f9d458b0e3ae1b7d066404c2b27 (patch)
tree95b2b57a07e6dd2401f62abff6941cac45a1a206 /linux
parentd4edc10f1e5f97e7b33317378419a8a7b6d44795 (diff)
downloadmediapointer-dvb-s2-8c77729bce0b4f9d458b0e3ae1b7d066404c2b27.tar.gz
mediapointer-dvb-s2-8c77729bce0b4f9d458b0e3ae1b7d066404c2b27.tar.bz2
em28xx: HVR-900 B3C0 - fix audio clicking issue
From: Wiktor Grebla <greblus@gmail.com> Fixed audio clicking problem which could be heard when using analog tv or composite input Priority: high Signed-off-by: Wiktor Grebla <greblus@gmail.com> Signed-off-by: Douglas Schilling Landgraf <dougsland@linuxtv.org>
Diffstat (limited to 'linux')
-rw-r--r--linux/drivers/media/video/em28xx/em28xx-audio.c4
-rw-r--r--linux/drivers/media/video/em28xx/em28xx-cards.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-audio.c b/linux/drivers/media/video/em28xx/em28xx-audio.c
index 14ef4da24..d6856b331 100644
--- a/linux/drivers/media/video/em28xx/em28xx-audio.c
+++ b/linux/drivers/media/video/em28xx/em28xx-audio.c
@@ -127,10 +127,10 @@ static void em28xx_audio_isocirq(struct urb *urb)
if (oldptr + length >= runtime->buffer_size) {
unsigned int cnt =
- runtime->buffer_size - oldptr - 1;
+ runtime->buffer_size - oldptr;
memcpy(runtime->dma_area + oldptr * stride, cp,
cnt * stride);
- memcpy(runtime->dma_area, cp + cnt,
+ memcpy(runtime->dma_area, cp + cnt * stride,
length * stride - cnt * stride);
} else {
memcpy(runtime->dma_area + oldptr * stride, cp,
diff --git a/linux/drivers/media/video/em28xx/em28xx-cards.c b/linux/drivers/media/video/em28xx/em28xx-cards.c
index 38874e024..620f659a9 100644
--- a/linux/drivers/media/video/em28xx/em28xx-cards.c
+++ b/linux/drivers/media/video/em28xx/em28xx-cards.c
@@ -578,7 +578,7 @@ struct em28xx_board em28xx_boards[] = {
}, {
.type = EM28XX_VMUX_COMPOSITE1,
.vmux = TVP5150_COMPOSITE1,
- .amux = 1,
+ .amux = 3,
}, {
.type = EM28XX_VMUX_SVIDEO,
.vmux = TVP5150_SVIDEO,