diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-04 14:40:20 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-04 14:40:20 -0300 |
| commit | 497b9fe8337262924cddfabd1dbb48c7ee041bd2 (patch) | |
| tree | bfd00eb09d5f3749ecd0b4abccbe217d3f6819c2 /linux | |
| parent | 67dc894dc09a789d5329cdbf26601b0485a4709a (diff) | |
| parent | 8c77729bce0b4f9d458b0e3ae1b7d066404c2b27 (diff) | |
| download | mediapointer-dvb-s2-497b9fe8337262924cddfabd1dbb48c7ee041bd2.tar.gz mediapointer-dvb-s2-497b9fe8337262924cddfabd1dbb48c7ee041bd2.tar.bz2 | |
merge: http://linuxtv.org/hg/~dougsland/em28xx-hvr
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx-audio.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx-cards.c | 2 |
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 5b839e662..4f078da31 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, |