Home Home > GIT Browse > SLE15
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2009-12-08 15:02:43 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2009-12-08 15:02:43 -0800
commitfb846e65b8a7535bf544682250142895c478ae7b (patch)
tree49cca12a7b07f1ab488e5b569f95c69552c18607
parentf23cb6b5657e6e5507b46290a48ce65021683061 (diff)
Revert "V4L/DVB (13190): em28xx: fix panic that can occur when starting audio streaming"
This reverts commit 72c62be1f9f89d3f60408ab55728237f37911e08. It breaks the build, and isn't necessary for the 2.6.27 tree. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/media/video/em28xx/em28xx-audio.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/media/video/em28xx/em28xx-audio.c b/drivers/media/video/em28xx/em28xx-audio.c
index 95f77b68d49e..ac3292d7646c 100644
--- a/drivers/media/video/em28xx/em28xx-audio.c
+++ b/drivers/media/video/em28xx/em28xx-audio.c
@@ -365,11 +365,6 @@ 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;
}