From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 5 Apr 2013 18:04:52 +0000 (-0700)
Subject: 3.4-stable patches
X-Git-Tag: v3.0.73~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7300a7040c8fda8ea2ff8e074f4c501f86418dd6;p=thirdparty%2Fkernel%2Fstable-queue.git

3.4-stable patches

added patches:
	asoc-dma-sh7760-fix-compile-error.patch
---

diff --git a/queue-3.4/asoc-dma-sh7760-fix-compile-error.patch b/queue-3.4/asoc-dma-sh7760-fix-compile-error.patch
new file mode 100644
index 00000000000..83a72027e1e
--- /dev/null
+++ b/queue-3.4/asoc-dma-sh7760-fix-compile-error.patch
@@ -0,0 +1,45 @@
+From 417a1178f1bf3cdc606376b3ded3a22489fbb3eb Mon Sep 17 00:00:00 2001
+From: Lars-Peter Clausen <lars@metafoo.de>
+Date: Fri, 15 Mar 2013 11:26:15 +0100
+Subject: ASoC: dma-sh7760: Fix compile error
+
+From: Lars-Peter Clausen <lars@metafoo.de>
+
+commit 417a1178f1bf3cdc606376b3ded3a22489fbb3eb upstream.
+
+The dma-sh7760 currently fails with the following compile error:
+	sound/soc/sh/dma-sh7760.c:346:2: error: unknown field 'pcm_ops' specified in initializer
+	sound/soc/sh/dma-sh7760.c:346:2: warning: initialization from incompatible pointer type
+	sound/soc/sh/dma-sh7760.c:347:2: error: unknown field 'pcm_new' specified in initializer
+	sound/soc/sh/dma-sh7760.c:347:2: warning: initialization makes integer from pointer without a cast
+	sound/soc/sh/dma-sh7760.c:348:2: error: unknown field 'pcm_free' specified in initializer
+	sound/soc/sh/dma-sh7760.c:348:2: warning: initialization from incompatible pointer type
+	sound/soc/sh/dma-sh7760.c: In function 'sh7760_soc_platform_probe':
+	sound/soc/sh/dma-sh7760.c:353:2: warning: passing argument 2 of 'snd_soc_register_platform' from incompatible pointer type
+	include/sound/soc.h:368:5: note: expected 'struct snd_soc_platform_driver *' but argument is of type 'struct snd_soc_platform *'
+
+This is due the misnaming of the snd_soc_platform_driver type name and 'ops'
+field. The issue was introduced in commit f0fba2a("ASoC: multi-component - ASoC
+Multi-Component Support").
+
+Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
+Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/soc/sh/dma-sh7760.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/sound/soc/sh/dma-sh7760.c
++++ b/sound/soc/sh/dma-sh7760.c
+@@ -342,8 +342,8 @@ static int camelot_pcm_new(struct snd_so
+ 	return 0;
+ }
+ 
+-static struct snd_soc_platform sh7760_soc_platform = {
+-	.pcm_ops 	= &camelot_pcm_ops,
++static struct snd_soc_platform_driver sh7760_soc_platform = {
++	.ops		= &camelot_pcm_ops,
+ 	.pcm_new	= camelot_pcm_new,
+ 	.pcm_free	= camelot_pcm_free,
+ };
diff --git a/queue-3.4/series b/queue-3.4/series
new file mode 100644
index 00000000000..decb332879d
--- /dev/null
+++ b/queue-3.4/series
@@ -0,0 +1 @@
+asoc-dma-sh7760-fix-compile-error.patch