Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 204e418b authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-3.2' into for-3.3

parents 095d79dc da403f87

sound/soc/mxs/mxs-pcm.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -136,7 +136,7 @@ static int snd_mxs_pcm_hw_params(struct snd_pcm_substream *substream, 
			iprtd->period_bytes * iprtd->periods,

			iprtd->period_bytes * iprtd->periods,

			iprtd->period_bytes,

			iprtd->period_bytes,

			substream->stream == SNDRV_PCM_STREAM_PLAYBACK ?

			substream->stream == SNDRV_PCM_STREAM_PLAYBACK ?

			DMA_MEM_TO_DEV : DMA_DEV_TO_MEM);

			DMA_TO_DEVICE : DMA_FROM_DEVICE);

	if (!iprtd->desc) {

	if (!iprtd->desc) {

		dev_err(&chan->dev->device, "cannot prepare slave dma\n");

		dev_err(&chan->dev->device, "cannot prepare slave dma\n");

		return -EINVAL;

		return -EINVAL;