diff options
| author | Devin Heitmueller <dheitmueller@kernellabs.com> | 2009-10-15 01:14:34 -0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-08 10:21:14 -0800 |
| commit | 27bff6b55ad0fe861530315bb75eb3401fa1b660 (patch) | |
| tree | ee23687e6a17a611785aee670c16d3c1d8a9c4b5 /drivers/media/video | |
| parent | 53017a39386cce1b7b6da3013176364424793115 (diff) | |
V4L/DVB (13190): em28xx: fix panic that can occur when starting audio streaming
commit 96fbf771d86a90ff006bc62ca4d4de6474b3de31 upstream.
Because the counters were not reset when starting up streaming, they would
be reused from the previous run. This can result in cases such that when the
second instance of streaming starts up, the "cnt" variable in
em28xx_audio_isocirq() can end up being negative, resulting in attempting to
write to memory before the start of runtime->dma_area (as well as having a
negative number of bytes to copy).
Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Michael Krufky <mkrufky@kernellabs.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/media/video')
| -rw-r--r-- | drivers/media/video/em28xx/em28xx-audio.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/media/video/em28xx/em28xx-audio.c b/drivers/media/video/em28xx/em28xx-audio.c index 7bd8a70f0a0b..ac947aecb9c3 100644 --- a/drivers/media/video/em28xx/em28xx-audio.c +++ b/drivers/media/video/em28xx/em28xx-audio.c @@ -383,6 +383,11 @@ static int snd_em28xx_hw_capture_free(struct snd_pcm_substream *substream) static int snd_em28xx_prepare(struct snd_pcm_substream *substream) { + struct em28xx *dev = snd_pcm_substream_chip(substream); + + dev->adev.hwptr_done_capture = 0; + dev->adev.capture_transfer_done = 0; + return 0; } |