brcm2708: update 3.10 patches with raspberrypi/rpi-3.10.y of 27 Apr. 2014

[openwrt.git] / target / linux / brcm2708 / patches-3.10 / 0146-fixes-a-bug-in-the-snd-bcm2835-driver.patch

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
index 8deafcf..16a5a6d 100644 (file)
--- 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
@@ -1,7 +1,7 @@
-From f7af161699cbbca544dd8feab4c05d9bc5ea8807 Mon Sep 17 00:00:00 2001
+From bd15c8ebc85f89b3e3c464a628f70ea4b144377f 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
+Subject: [PATCH 146/196] 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
@@ -11,9 +11,11 @@ initialized.
  sound/arm/bcm2835-pcm.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
+diff --git a/sound/arm/bcm2835-pcm.c b/sound/arm/bcm2835-pcm.c
+index 21e435b..499e225 100755
 --- a/sound/arm/bcm2835-pcm.c
 +++ b/sound/arm/bcm2835-pcm.c
-@@ -127,7 +127,6 @@ static int snd_bcm2835_playback_open(str
+@@ -127,7 +127,6 @@ static int snd_bcm2835_playback_open(struct snd_pcm_substream *substream)
        alsa_stream->chip = chip;
        alsa_stream->substream = substream;
        alsa_stream->idx = idx;
@@ -21,7 +23,7 @@ initialized.
  
        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
+@@ -149,6 +148,7 @@ static int snd_bcm2835_playback_open(struct snd_pcm_substream *substream)
                kfree(alsa_stream);
                return err;
        }
@@ -29,3 +31,6 @@ initialized.
  
        alsa_stream->open = 1;
        alsa_stream->draining = 1;
+-- 
+1.9.1
+