diff options
| author | Mark Brown <broonie@kernel.org> | 2016-05-13 09:26:21 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-05-13 09:26:21 -0400 |
| commit | 35302156ea791f96bdc7e0ca3c44cb25341fbcb1 (patch) | |
| tree | d9fbabcfbb9a8a19f5d6a87eb1dc5c930f3074c5 | |
| parent | bf10262159cfd7ed76b777927e7cba628cea85ba (diff) | |
| parent | e92077c3f45395881ad8c690bb86a85ffe5198ba (diff) | |
Merge remote-tracking branch 'asoc/topic/imx' into asoc-next
| -rw-r--r-- | sound/soc/fsl/imx-pcm-fiq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/fsl/imx-pcm-fiq.c b/sound/soc/fsl/imx-pcm-fiq.c index e63cd5ecfd8f..dac6688540dc 100644 --- a/sound/soc/fsl/imx-pcm-fiq.c +++ b/sound/soc/fsl/imx-pcm-fiq.c | |||
| @@ -220,7 +220,7 @@ static int snd_imx_pcm_mmap(struct snd_pcm_substream *substream, | |||
| 220 | ret = dma_mmap_wc(substream->pcm->card->dev, vma, runtime->dma_area, | 220 | ret = dma_mmap_wc(substream->pcm->card->dev, vma, runtime->dma_area, |
| 221 | runtime->dma_addr, runtime->dma_bytes); | 221 | runtime->dma_addr, runtime->dma_bytes); |
| 222 | 222 | ||
| 223 | pr_debug("%s: ret: %d %p %pad 0x%08x\n", __func__, ret, | 223 | pr_debug("%s: ret: %d %p %pad 0x%08zx\n", __func__, ret, |
| 224 | runtime->dma_area, | 224 | runtime->dma_area, |
| 225 | &runtime->dma_addr, | 225 | &runtime->dma_addr, |
| 226 | runtime->dma_bytes); | 226 | runtime->dma_bytes); |