1 files changed, 10 insertions, 8 deletions

diff --git a/sound/soc/samsung/pcm.c b/sound/soc/samsung/pcm.c
index e54256fc4b2c..6a5e4bf6ac96 100644
--- a/sound/soc/samsung/pcm.c
+++ b/sound/soc/samsung/pcm.c
@@ -275,7 +275,6 @@ static int s3c_pcm_hw_params(struct snd_pcm_substream *substream,
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct s3c_pcm_info *pcm = snd_soc_dai_get_drvdata(rtd->cpu_dai);
-        struct s3c_dma_params *dma_data;
         void __iomem *regs = pcm->regs;
         struct clk *clk;
         int sclk_div, sync_div;
@@ -284,13 +283,6 @@ static int s3c_pcm_hw_params(struct snd_pcm_substream *substream,
 
         dev_dbg(pcm->dev, "Entered %s\n", __func__);
 
-        if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
-                dma_data = pcm->dma_playback;
-        else
-                dma_data = pcm->dma_capture;
-
-        snd_soc_dai_set_dma_data(rtd->cpu_dai, substream, dma_data);
-
         /* Strictly check for sample size */
         switch (params_format(params)) {
         case SNDRV_PCM_FORMAT_S16_LE:
@@ -461,10 +453,20 @@ static const struct snd_soc_dai_ops s3c_pcm_dai_ops = {
         .set_fmt        = s3c_pcm_set_fmt,
 };
 
+static int s3c_pcm_dai_probe(struct snd_soc_dai *dai)
+{
+        struct s3c_pcm_info *pcm = snd_soc_dai_get_drvdata(dai);
+
+        snd_soc_dai_init_dma_data(dai, pcm->dma_playback, pcm->dma_capture);
+
+        return 0;
+}
+
 #define S3C_PCM_RATES  SNDRV_PCM_RATE_8000_96000
 
 #define S3C_PCM_DAI_DECLARE                     \
         .symmetric_rates = 1,                                   \
+        .probe = s3c_pcm_dai_probe,                             \
         .ops = &s3c_pcm_dai_ops,                                \
         .playback = {                                           \
                 .channels_min   = 2,                            \