From 0d0dd95ad1eb7dfad6c678b80e8a298a62b153e7 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Sat, 20 Apr 2013 19:29:02 +0200 Subject: [PATCH] --- yaml --- r: 372045 b: refs/heads/master c: 8c1bb4ecbca575ec89310a50c3d3dd475bf81fd0 h: refs/heads/master i: 372043: 80694cc8b6ab76875fdd5f886bfeac2f936b3fa0 v: v3 --- [refs] | 2 +- trunk/sound/soc/mxs/mxs-saif.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 681761fb81d4..cc71eea91708 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 57364f9ae24c3a29163c23d5219bccef7bccc96a +refs/heads/master: 8c1bb4ecbca575ec89310a50c3d3dd475bf81fd0 diff --git a/trunk/sound/soc/mxs/mxs-saif.c b/trunk/sound/soc/mxs/mxs-saif.c index f13bd8730b0f..d796a393968d 100644 --- a/trunk/sound/soc/mxs/mxs-saif.c +++ b/trunk/sound/soc/mxs/mxs-saif.c @@ -369,7 +369,6 @@ static int mxs_saif_startup(struct snd_pcm_substream *substream, struct snd_soc_dai *cpu_dai) { struct mxs_saif *saif = snd_soc_dai_get_drvdata(cpu_dai); - snd_soc_dai_set_dma_data(cpu_dai, substream, &saif->dma_param); /* clear error status to 0 for each re-open */ saif->fifo_underrun = 0; @@ -605,6 +604,8 @@ static int mxs_saif_dai_probe(struct snd_soc_dai *dai) struct mxs_saif *saif = dev_get_drvdata(dai->dev); snd_soc_dai_set_drvdata(dai, saif); + dai->playback_dma_data = &saif->dma_param; + dai->capture_dma_data = &saif->dma_param; return 0; }