ASoC: move dma_data from snd_soc_dai to snd_soc_pcm_stream

This fixes a memory corruption when ASoC devices are used in
full-duplex mode. Specifically for pxa-ssp code, where this pointer
is dynamically allocated for each direction and destroyed upon each
stream start.

All other platforms are fixed blindly, I couldn't even compile-test
them. Sorry for any breakage I may have caused.

Reported-by: Sven Neumann <s.neumann@raumfeld.com>
Reported-by: Michael Hirsch <m.hirsch@raumfeld.com>
Signed-off-by: Daniel Mack <daniel@caiaq.de>
Acked-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Acked-by: Jarkko Nikula <jhnikula@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

2 files changed, 18 insertions, 1 deletions

diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index 6cf76a41501e..377693a14385 100644
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -224,7 +224,6 @@ struct snd_soc_dai {
         struct snd_soc_codec *codec;
         unsigned int active;
         unsigned char pop_wait:1;
-        void *dma_data;
 
         /* DAI private data */
         void *private_data;
@@ -235,4 +234,21 @@ struct snd_soc_dai {
         struct list_head list;
 };
 
+static inline void *snd_soc_dai_get_dma_data(const struct snd_soc_dai *dai,
+                                             const struct snd_pcm_substream *ss)
+{
+        return (ss->stream == SNDRV_PCM_STREAM_PLAYBACK) ?
+                dai->playback.dma_data : dai->capture.dma_data;
+}
+
+static inline void snd_soc_dai_set_dma_data(struct snd_soc_dai *dai,
+                                            const struct snd_pcm_substream *ss,
+                                            void *data)
+{
+        if (ss->stream == SNDRV_PCM_STREAM_PLAYBACK)
+                dai->playback.dma_data = data;
+        else
+                dai->capture.dma_data = data;
+}
+
 #endif
diff --git a/include/sound/soc.h b/include/sound/soc.h
index dbfec16015de..b8bac6ae6244 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -376,6 +376,7 @@ struct snd_soc_pcm_stream {
         unsigned int channels_min;      /* min channels */
         unsigned int channels_max;      /* max channels */
         unsigned int active;            /* num of active users of the stream */
+        void *dma_data;                 /* used by platform code */
 };
 
 /* SoC audio ops */