diff options
author | Florian Fainelli <florian@openwrt.org> | 2014-02-28 20:30:08 +0000 |
---|---|---|
committer | Florian Fainelli <florian@openwrt.org> | 2014-02-28 20:30:08 +0000 |
commit | bb39b8d99aae1f7eb13a97bd874838da91080de6 (patch) | |
tree | 3046f53937c0bc5dc13e2b2ab7b688a1932199bf /target/linux/brcm2708/patches-3.10/0146-fixes-a-bug-in-the-snd-bcm2835-driver.patch | |
parent | c6c0d09f85c211560a1405441925681cfa25e8b1 (diff) | |
download | upstream-bb39b8d99aae1f7eb13a97bd874838da91080de6.tar.gz upstream-bb39b8d99aae1f7eb13a97bd874838da91080de6.tar.bz2 upstream-bb39b8d99aae1f7eb13a97bd874838da91080de6.zip |
brcm2708: update against latest rpi-3.10.y branch
Update our copies of the brcm2708 patches to the latest rpi-3.10-y
rebased against linux-3.10.y stable (3.10.32). This should hopefully
make it easier for us in the future to leverage the raspberry/rpi-*
branches.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
SVN-Revision: 39770
Diffstat (limited to 'target/linux/brcm2708/patches-3.10/0146-fixes-a-bug-in-the-snd-bcm2835-driver.patch')
-rw-r--r-- | target/linux/brcm2708/patches-3.10/0146-fixes-a-bug-in-the-snd-bcm2835-driver.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-3.10/0146-fixes-a-bug-in-the-snd-bcm2835-driver.patch b/target/linux/brcm2708/patches-3.10/0146-fixes-a-bug-in-the-snd-bcm2835-driver.patch new file mode 100644 index 0000000000..8deafcffaa --- /dev/null +++ b/target/linux/brcm2708/patches-3.10/0146-fixes-a-bug-in-the-snd-bcm2835-driver.patch @@ -0,0 +1,31 @@ +From f7af161699cbbca544dd8feab4c05d9bc5ea8807 Mon Sep 17 00:00:00 2001 +From: Janis Danisevskis <werwurm@snafu.de> +Date: Wed, 1 Jan 2014 18:41:53 +0100 +Subject: [PATCH 146/174] fixes a bug in the snd-bcm2835 driver + +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(-) + +--- a/sound/arm/bcm2835-pcm.c ++++ b/sound/arm/bcm2835-pcm.c +@@ -127,7 +127,6 @@ static int snd_bcm2835_playback_open(str + 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); +@@ -149,6 +148,7 @@ static int snd_bcm2835_playback_open(str + kfree(alsa_stream); + return err; + } ++ chip->alsa_stream[idx] = alsa_stream; + + alsa_stream->open = 1; + alsa_stream->draining = 1; |