forked from Minki/linux
Merge branch 'for-3.2' into for-3.3
This commit is contained in:
commit
204e418bd2
@ -136,7 +136,7 @@ static int snd_mxs_pcm_hw_params(struct snd_pcm_substream *substream,
|
||||
iprtd->period_bytes * iprtd->periods,
|
||||
iprtd->period_bytes,
|
||||
substream->stream == SNDRV_PCM_STREAM_PLAYBACK ?
|
||||
DMA_MEM_TO_DEV : DMA_DEV_TO_MEM);
|
||||
DMA_TO_DEVICE : DMA_FROM_DEVICE);
|
||||
if (!iprtd->desc) {
|
||||
dev_err(&chan->dev->device, "cannot prepare slave dma\n");
|
||||
return -EINVAL;
|
||||
|
Loading…
Reference in New Issue
Block a user