2014-09-27 19:10:51 +00:00
|
|
|
From bd15c8ebc85f89b3e3c464a628f70ea4b144377f Mon Sep 17 00:00:00 2001
|
2014-02-28 20:30:08 +00:00
|
|
|
From: Janis Danisevskis <werwurm@snafu.de>
|
|
|
|
|
Date: Wed, 1 Jan 2014 18:41:53 +0100
|
2014-09-27 19:10:51 +00:00
|
|
|
Subject: [PATCH 146/196] fixes a bug in the snd-bcm2835 driver
|
2014-02-28 20:30:08 +00:00
|
|
|
|
|
|
|
|
The "instance" field of bcm2835_alsa_stream_t may be accessed uninitialized
|
|
|
|
|
by bcm2835_audio_set_ctls_chan if called during stream creation. This fix
|
|
|
|
|
deferres the addition to of the stream to chip untill it has been fully
|
|
|
|
|
initialized.
|
|
|
|
|
---
|
|
|
|
|
sound/arm/bcm2835-pcm.c | 2 +-
|
|
|
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
|
|
2014-09-27 19:10:51 +00:00
|
|
|
diff --git a/sound/arm/bcm2835-pcm.c b/sound/arm/bcm2835-pcm.c
|
|
|
|
|
index 21e435b..499e225 100755
|
2014-02-28 20:30:08 +00:00
|
|
|
--- a/sound/arm/bcm2835-pcm.c
|
|
|
|
|
+++ b/sound/arm/bcm2835-pcm.c
|
2014-09-27 19:10:51 +00:00
|
|
|
@@ -127,7 +127,6 @@ static int snd_bcm2835_playback_open(struct snd_pcm_substream *substream)
|
2014-02-28 20:30:08 +00:00
|
|
|
alsa_stream->chip = chip;
|
|
|
|
|
alsa_stream->substream = substream;
|
|
|
|
|
alsa_stream->idx = idx;
|
|
|
|
|
- chip->alsa_stream[idx] = alsa_stream;
|
|
|
|
|
|
|
|
|
|
sema_init(&alsa_stream->buffers_update_sem, 0);
|
|
|
|
|
sema_init(&alsa_stream->control_sem, 0);
|
2014-09-27 19:10:51 +00:00
|
|
|
@@ -149,6 +148,7 @@ static int snd_bcm2835_playback_open(struct snd_pcm_substream *substream)
|
2014-02-28 20:30:08 +00:00
|
|
|
kfree(alsa_stream);
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
+ chip->alsa_stream[idx] = alsa_stream;
|
|
|
|
|
|
|
|
|
|
alsa_stream->open = 1;
|
|
|
|
|
alsa_stream->draining = 1;
|
2014-09-27 19:10:51 +00:00
|
|
|
--
|
|
|
|
|
1.9.1
|
|
|
|
|
|
