diff options
| author | Xinyu Chen <xinyu.chen@freescale.com> | 2012-08-03 10:01:08 +0800 |
|---|---|---|
| committer | Xinyu Chen <xinyu.chen@freescale.com> | 2012-08-03 10:01:08 +0800 |
| commit | b4c1ea277292614383f036c88554a296df64ecac (patch) | |
| tree | 0364cb393667d361e369cd130dad018fd9396a6a /sound | |
| parent | 8e26c065b9999f7d6a6a3bd3aa3984fd1dbbe793 (diff) | |
| parent | 76f691466a56fc235d4f4e138195dc78a5823c37 (diff) | |
Merge remote branch 'fsl-linux-sdk/imx_3.0.35' into imx_3.0.35_android
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/imx/imx-hdmi-dma.c | 2 | ||||
| -rw-r--r-- | sound/soc/imx/imx-pcm-dma-mx2.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/imx/imx-hdmi-dma.c b/sound/soc/imx/imx-hdmi-dma.c index a743d10ba8a8..443ff1096946 100644 --- a/sound/soc/imx/imx-hdmi-dma.c +++ b/sound/soc/imx/imx-hdmi-dma.c @@ -938,7 +938,7 @@ static int hdmi_sdma_alloc(struct imx_hdmi_dma_runtime_data *params) dma_cap_mask_t mask; params->dma_data.peripheral_type = IMX_DMATYPE_HDMI; - params->dma_data.priority = DMA_PRIO_MEDIUM; + params->dma_data.priority = DMA_PRIO_HIGH; params->dma_data.dma_request = MX6Q_DMA_REQ_EXT_DMA_REQ_0; params->dma_data.private = ¶ms->sdma_params; diff --git a/sound/soc/imx/imx-pcm-dma-mx2.c b/sound/soc/imx/imx-pcm-dma-mx2.c index 712bf7d49522..b36b28108049 100644 --- a/sound/soc/imx/imx-pcm-dma-mx2.c +++ b/sound/soc/imx/imx-pcm-dma-mx2.c @@ -426,6 +426,7 @@ static int snd_imx_open(struct snd_pcm_substream *substream) iprtd->asrc_enable = true; iprtd->p2p = (struct asrc_p2p_params *)snd_soc_pcm_get_drvdata(rtd); + iprtd->asrc_index = -1; } runtime->private_data = iprtd; |