ASoC: check for substream not channels_min in pcm engines
This is a follow up on53dea36c70
which fixes the other affected pcm engines. Description from53dea36c70
: Don't rely on the codec's channels_min information to decide wheter or not allocate a substream's DMA buffer. Rather check if the substream itself was allocated previously. Without this patch I was seeing null-pointer dereferenc in atmel-pcm. Signed-off-by: Joachim Eastwood <joachim.eastwood@jotron.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
parent
739be96ab8
commit
25e9e7565f
|
@ -367,7 +367,6 @@ static u64 atmel_pcm_dmamask = 0xffffffff;
|
||||||
static int atmel_pcm_new(struct snd_soc_pcm_runtime *rtd)
|
static int atmel_pcm_new(struct snd_soc_pcm_runtime *rtd)
|
||||||
{
|
{
|
||||||
struct snd_card *card = rtd->card->snd_card;
|
struct snd_card *card = rtd->card->snd_card;
|
||||||
struct snd_soc_dai *dai = rtd->cpu_dai;
|
|
||||||
struct snd_pcm *pcm = rtd->pcm;
|
struct snd_pcm *pcm = rtd->pcm;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
|
@ -376,14 +375,14 @@ static int atmel_pcm_new(struct snd_soc_pcm_runtime *rtd)
|
||||||
if (!card->dev->coherent_dma_mask)
|
if (!card->dev->coherent_dma_mask)
|
||||||
card->dev->coherent_dma_mask = 0xffffffff;
|
card->dev->coherent_dma_mask = 0xffffffff;
|
||||||
|
|
||||||
if (dai->driver->playback.channels_min) {
|
if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {
|
||||||
ret = atmel_pcm_preallocate_dma_buffer(pcm,
|
ret = atmel_pcm_preallocate_dma_buffer(pcm,
|
||||||
SNDRV_PCM_STREAM_PLAYBACK);
|
SNDRV_PCM_STREAM_PLAYBACK);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (dai->driver->capture.channels_min) {
|
if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) {
|
||||||
pr_debug("atmel-pcm:"
|
pr_debug("atmel-pcm:"
|
||||||
"Allocating PCM capture DMA buffer\n");
|
"Allocating PCM capture DMA buffer\n");
|
||||||
ret = atmel_pcm_preallocate_dma_buffer(pcm,
|
ret = atmel_pcm_preallocate_dma_buffer(pcm,
|
||||||
|
|
|
@ -421,7 +421,6 @@ static u64 bf5xx_pcm_dmamask = DMA_BIT_MASK(32);
|
||||||
static int bf5xx_pcm_ac97_new(struct snd_soc_pcm_runtime *rtd)
|
static int bf5xx_pcm_ac97_new(struct snd_soc_pcm_runtime *rtd)
|
||||||
{
|
{
|
||||||
struct snd_card *card = rtd->card->snd_card;
|
struct snd_card *card = rtd->card->snd_card;
|
||||||
struct snd_soc_dai *dai = rtd->cpu_dai;
|
|
||||||
struct snd_pcm *pcm = rtd->pcm;
|
struct snd_pcm *pcm = rtd->pcm;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
|
@ -431,14 +430,14 @@ static int bf5xx_pcm_ac97_new(struct snd_soc_pcm_runtime *rtd)
|
||||||
if (!card->dev->coherent_dma_mask)
|
if (!card->dev->coherent_dma_mask)
|
||||||
card->dev->coherent_dma_mask = DMA_BIT_MASK(32);
|
card->dev->coherent_dma_mask = DMA_BIT_MASK(32);
|
||||||
|
|
||||||
if (dai->driver->playback.channels_min) {
|
if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {
|
||||||
ret = bf5xx_pcm_preallocate_dma_buffer(pcm,
|
ret = bf5xx_pcm_preallocate_dma_buffer(pcm,
|
||||||
SNDRV_PCM_STREAM_PLAYBACK);
|
SNDRV_PCM_STREAM_PLAYBACK);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (dai->driver->capture.channels_min) {
|
if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) {
|
||||||
ret = bf5xx_pcm_preallocate_dma_buffer(pcm,
|
ret = bf5xx_pcm_preallocate_dma_buffer(pcm,
|
||||||
SNDRV_PCM_STREAM_CAPTURE);
|
SNDRV_PCM_STREAM_CAPTURE);
|
||||||
if (ret)
|
if (ret)
|
||||||
|
|
|
@ -260,7 +260,6 @@ static u64 bf5xx_pcm_dmamask = DMA_BIT_MASK(32);
|
||||||
static int bf5xx_pcm_i2s_new(struct snd_soc_pcm_runtime *rtd)
|
static int bf5xx_pcm_i2s_new(struct snd_soc_pcm_runtime *rtd)
|
||||||
{
|
{
|
||||||
struct snd_card *card = rtd->card->snd_card;
|
struct snd_card *card = rtd->card->snd_card;
|
||||||
struct snd_soc_dai *dai = rtd->cpu_dai;
|
|
||||||
struct snd_pcm *pcm = rtd->pcm;
|
struct snd_pcm *pcm = rtd->pcm;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
|
@ -270,14 +269,14 @@ static int bf5xx_pcm_i2s_new(struct snd_soc_pcm_runtime *rtd)
|
||||||
if (!card->dev->coherent_dma_mask)
|
if (!card->dev->coherent_dma_mask)
|
||||||
card->dev->coherent_dma_mask = DMA_BIT_MASK(32);
|
card->dev->coherent_dma_mask = DMA_BIT_MASK(32);
|
||||||
|
|
||||||
if (dai->driver->playback.channels_min) {
|
if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {
|
||||||
ret = bf5xx_pcm_preallocate_dma_buffer(pcm,
|
ret = bf5xx_pcm_preallocate_dma_buffer(pcm,
|
||||||
SNDRV_PCM_STREAM_PLAYBACK);
|
SNDRV_PCM_STREAM_PLAYBACK);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (dai->driver->capture.channels_min) {
|
if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) {
|
||||||
ret = bf5xx_pcm_preallocate_dma_buffer(pcm,
|
ret = bf5xx_pcm_preallocate_dma_buffer(pcm,
|
||||||
SNDRV_PCM_STREAM_CAPTURE);
|
SNDRV_PCM_STREAM_CAPTURE);
|
||||||
if (ret)
|
if (ret)
|
||||||
|
|
|
@ -286,7 +286,6 @@ static u64 bf5xx_pcm_dmamask = DMA_BIT_MASK(32);
|
||||||
static int bf5xx_pcm_tdm_new(struct snd_soc_pcm_runtime *rtd)
|
static int bf5xx_pcm_tdm_new(struct snd_soc_pcm_runtime *rtd)
|
||||||
{
|
{
|
||||||
struct snd_card *card = rtd->card->snd_card;
|
struct snd_card *card = rtd->card->snd_card;
|
||||||
struct snd_soc_dai *dai = rtd->cpu_dai;
|
|
||||||
struct snd_pcm *pcm = rtd->pcm;
|
struct snd_pcm *pcm = rtd->pcm;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
|
@ -295,14 +294,14 @@ static int bf5xx_pcm_tdm_new(struct snd_soc_pcm_runtime *rtd)
|
||||||
if (!card->dev->coherent_dma_mask)
|
if (!card->dev->coherent_dma_mask)
|
||||||
card->dev->coherent_dma_mask = DMA_BIT_MASK(32);
|
card->dev->coherent_dma_mask = DMA_BIT_MASK(32);
|
||||||
|
|
||||||
if (dai->driver->playback.channels_min) {
|
if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {
|
||||||
ret = bf5xx_pcm_preallocate_dma_buffer(pcm,
|
ret = bf5xx_pcm_preallocate_dma_buffer(pcm,
|
||||||
SNDRV_PCM_STREAM_PLAYBACK);
|
SNDRV_PCM_STREAM_PLAYBACK);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (dai->driver->capture.channels_min) {
|
if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) {
|
||||||
ret = bf5xx_pcm_preallocate_dma_buffer(pcm,
|
ret = bf5xx_pcm_preallocate_dma_buffer(pcm,
|
||||||
SNDRV_PCM_STREAM_CAPTURE);
|
SNDRV_PCM_STREAM_CAPTURE);
|
||||||
if (ret)
|
if (ret)
|
||||||
|
|
|
@ -831,7 +831,6 @@ static u64 davinci_pcm_dmamask = 0xffffffff;
|
||||||
static int davinci_pcm_new(struct snd_soc_pcm_runtime *rtd)
|
static int davinci_pcm_new(struct snd_soc_pcm_runtime *rtd)
|
||||||
{
|
{
|
||||||
struct snd_card *card = rtd->card->snd_card;
|
struct snd_card *card = rtd->card->snd_card;
|
||||||
struct snd_soc_dai *dai = rtd->cpu_dai;
|
|
||||||
struct snd_pcm *pcm = rtd->pcm;
|
struct snd_pcm *pcm = rtd->pcm;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
@ -840,7 +839,7 @@ static int davinci_pcm_new(struct snd_soc_pcm_runtime *rtd)
|
||||||
if (!card->dev->coherent_dma_mask)
|
if (!card->dev->coherent_dma_mask)
|
||||||
card->dev->coherent_dma_mask = 0xffffffff;
|
card->dev->coherent_dma_mask = 0xffffffff;
|
||||||
|
|
||||||
if (dai->driver->playback.channels_min) {
|
if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {
|
||||||
ret = davinci_pcm_preallocate_dma_buffer(pcm,
|
ret = davinci_pcm_preallocate_dma_buffer(pcm,
|
||||||
SNDRV_PCM_STREAM_PLAYBACK,
|
SNDRV_PCM_STREAM_PLAYBACK,
|
||||||
pcm_hardware_playback.buffer_bytes_max);
|
pcm_hardware_playback.buffer_bytes_max);
|
||||||
|
@ -848,7 +847,7 @@ static int davinci_pcm_new(struct snd_soc_pcm_runtime *rtd)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (dai->driver->capture.channels_min) {
|
if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) {
|
||||||
ret = davinci_pcm_preallocate_dma_buffer(pcm,
|
ret = davinci_pcm_preallocate_dma_buffer(pcm,
|
||||||
SNDRV_PCM_STREAM_CAPTURE,
|
SNDRV_PCM_STREAM_CAPTURE,
|
||||||
pcm_hardware_capture.buffer_bytes_max);
|
pcm_hardware_capture.buffer_bytes_max);
|
||||||
|
|
|
@ -286,7 +286,6 @@ static u64 ep93xx_pcm_dmamask = 0xffffffff;
|
||||||
static int ep93xx_pcm_new(struct snd_soc_pcm_runtime *rtd)
|
static int ep93xx_pcm_new(struct snd_soc_pcm_runtime *rtd)
|
||||||
{
|
{
|
||||||
struct snd_card *card = rtd->card->snd_card;
|
struct snd_card *card = rtd->card->snd_card;
|
||||||
struct snd_soc_dai *dai = rtd->cpu_dai;
|
|
||||||
struct snd_pcm *pcm = rtd->pcm;
|
struct snd_pcm *pcm = rtd->pcm;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
|
@ -295,14 +294,14 @@ static int ep93xx_pcm_new(struct snd_soc_pcm_runtime *rtd)
|
||||||
if (!card->dev->coherent_dma_mask)
|
if (!card->dev->coherent_dma_mask)
|
||||||
card->dev->coherent_dma_mask = 0xffffffff;
|
card->dev->coherent_dma_mask = 0xffffffff;
|
||||||
|
|
||||||
if (dai->driver->playback.channels_min) {
|
if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {
|
||||||
ret = ep93xx_pcm_preallocate_dma_buffer(pcm,
|
ret = ep93xx_pcm_preallocate_dma_buffer(pcm,
|
||||||
SNDRV_PCM_STREAM_PLAYBACK);
|
SNDRV_PCM_STREAM_PLAYBACK);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (dai->driver->capture.channels_min) {
|
if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) {
|
||||||
ret = ep93xx_pcm_preallocate_dma_buffer(pcm,
|
ret = ep93xx_pcm_preallocate_dma_buffer(pcm,
|
||||||
SNDRV_PCM_STREAM_CAPTURE);
|
SNDRV_PCM_STREAM_CAPTURE);
|
||||||
if (ret)
|
if (ret)
|
||||||
|
|
|
@ -302,7 +302,6 @@ static u64 jz4740_pcm_dmamask = DMA_BIT_MASK(32);
|
||||||
static int jz4740_pcm_new(struct snd_soc_pcm_runtime *rtd)
|
static int jz4740_pcm_new(struct snd_soc_pcm_runtime *rtd)
|
||||||
{
|
{
|
||||||
struct snd_card *card = rtd->card->snd_card;
|
struct snd_card *card = rtd->card->snd_card;
|
||||||
struct snd_soc_dai *dai = rtd->cpu_dai;
|
|
||||||
struct snd_pcm *pcm = rtd->pcm;
|
struct snd_pcm *pcm = rtd->pcm;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
|
@ -312,14 +311,14 @@ static int jz4740_pcm_new(struct snd_soc_pcm_runtime *rtd)
|
||||||
if (!card->dev->coherent_dma_mask)
|
if (!card->dev->coherent_dma_mask)
|
||||||
card->dev->coherent_dma_mask = DMA_BIT_MASK(32);
|
card->dev->coherent_dma_mask = DMA_BIT_MASK(32);
|
||||||
|
|
||||||
if (dai->driver->playback.channels_min) {
|
if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {
|
||||||
ret = jz4740_pcm_preallocate_dma_buffer(pcm,
|
ret = jz4740_pcm_preallocate_dma_buffer(pcm,
|
||||||
SNDRV_PCM_STREAM_PLAYBACK);
|
SNDRV_PCM_STREAM_PLAYBACK);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto err;
|
goto err;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (dai->driver->capture.channels_min) {
|
if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) {
|
||||||
ret = jz4740_pcm_preallocate_dma_buffer(pcm,
|
ret = jz4740_pcm_preallocate_dma_buffer(pcm,
|
||||||
SNDRV_PCM_STREAM_CAPTURE);
|
SNDRV_PCM_STREAM_CAPTURE);
|
||||||
if (ret)
|
if (ret)
|
||||||
|
|
|
@ -315,7 +315,6 @@ static int kirkwood_dma_preallocate_dma_buffer(struct snd_pcm *pcm,
|
||||||
static int kirkwood_dma_new(struct snd_soc_pcm_runtime *rtd)
|
static int kirkwood_dma_new(struct snd_soc_pcm_runtime *rtd)
|
||||||
{
|
{
|
||||||
struct snd_card *card = rtd->card->snd_card;
|
struct snd_card *card = rtd->card->snd_card;
|
||||||
struct snd_soc_dai *dai = rtd->cpu_dai;
|
|
||||||
struct snd_pcm *pcm = rtd->pcm;
|
struct snd_pcm *pcm = rtd->pcm;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
@ -324,14 +323,14 @@ static int kirkwood_dma_new(struct snd_soc_pcm_runtime *rtd)
|
||||||
if (!card->dev->coherent_dma_mask)
|
if (!card->dev->coherent_dma_mask)
|
||||||
card->dev->coherent_dma_mask = 0xffffffff;
|
card->dev->coherent_dma_mask = 0xffffffff;
|
||||||
|
|
||||||
if (dai->driver->playback.channels_min) {
|
if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {
|
||||||
ret = kirkwood_dma_preallocate_dma_buffer(pcm,
|
ret = kirkwood_dma_preallocate_dma_buffer(pcm,
|
||||||
SNDRV_PCM_STREAM_PLAYBACK);
|
SNDRV_PCM_STREAM_PLAYBACK);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (dai->driver->capture.channels_min) {
|
if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) {
|
||||||
ret = kirkwood_dma_preallocate_dma_buffer(pcm,
|
ret = kirkwood_dma_preallocate_dma_buffer(pcm,
|
||||||
SNDRV_PCM_STREAM_CAPTURE);
|
SNDRV_PCM_STREAM_CAPTURE);
|
||||||
if (ret)
|
if (ret)
|
||||||
|
|
|
@ -446,13 +446,12 @@ static void sst_pcm_free(struct snd_pcm *pcm)
|
||||||
|
|
||||||
static int sst_pcm_new(struct snd_soc_pcm_runtime *rtd)
|
static int sst_pcm_new(struct snd_soc_pcm_runtime *rtd)
|
||||||
{
|
{
|
||||||
struct snd_soc_dai *dai = rtd->cpu_dai;
|
|
||||||
struct snd_pcm *pcm = rtd->pcm;
|
struct snd_pcm *pcm = rtd->pcm;
|
||||||
int retval = 0;
|
int retval = 0;
|
||||||
|
|
||||||
pr_debug("sst_pcm_new called\n");
|
pr_debug("sst_pcm_new called\n");
|
||||||
if (dai->driver->playback.channels_min ||
|
if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream ||
|
||||||
dai->driver->capture.channels_min) {
|
pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) {
|
||||||
retval = snd_pcm_lib_preallocate_pages_for_all(pcm,
|
retval = snd_pcm_lib_preallocate_pages_for_all(pcm,
|
||||||
SNDRV_DMA_TYPE_CONTINUOUS,
|
SNDRV_DMA_TYPE_CONTINUOUS,
|
||||||
snd_dma_continuous_data(GFP_KERNEL),
|
snd_dma_continuous_data(GFP_KERNEL),
|
||||||
|
|
|
@ -378,7 +378,6 @@ static void omap_pcm_free_dma_buffers(struct snd_pcm *pcm)
|
||||||
static int omap_pcm_new(struct snd_soc_pcm_runtime *rtd)
|
static int omap_pcm_new(struct snd_soc_pcm_runtime *rtd)
|
||||||
{
|
{
|
||||||
struct snd_card *card = rtd->card->snd_card;
|
struct snd_card *card = rtd->card->snd_card;
|
||||||
struct snd_soc_dai *dai = rtd->cpu_dai;
|
|
||||||
struct snd_pcm *pcm = rtd->pcm;
|
struct snd_pcm *pcm = rtd->pcm;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
|
@ -387,14 +386,14 @@ static int omap_pcm_new(struct snd_soc_pcm_runtime *rtd)
|
||||||
if (!card->dev->coherent_dma_mask)
|
if (!card->dev->coherent_dma_mask)
|
||||||
card->dev->coherent_dma_mask = DMA_BIT_MASK(64);
|
card->dev->coherent_dma_mask = DMA_BIT_MASK(64);
|
||||||
|
|
||||||
if (dai->driver->playback.channels_min) {
|
if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {
|
||||||
ret = omap_pcm_preallocate_dma_buffer(pcm,
|
ret = omap_pcm_preallocate_dma_buffer(pcm,
|
||||||
SNDRV_PCM_STREAM_PLAYBACK);
|
SNDRV_PCM_STREAM_PLAYBACK);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (dai->driver->capture.channels_min) {
|
if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) {
|
||||||
ret = omap_pcm_preallocate_dma_buffer(pcm,
|
ret = omap_pcm_preallocate_dma_buffer(pcm,
|
||||||
SNDRV_PCM_STREAM_CAPTURE);
|
SNDRV_PCM_STREAM_CAPTURE);
|
||||||
if (ret)
|
if (ret)
|
||||||
|
|
|
@ -403,7 +403,6 @@ static u64 dma_mask = DMA_BIT_MASK(32);
|
||||||
static int dma_new(struct snd_soc_pcm_runtime *rtd)
|
static int dma_new(struct snd_soc_pcm_runtime *rtd)
|
||||||
{
|
{
|
||||||
struct snd_card *card = rtd->card->snd_card;
|
struct snd_card *card = rtd->card->snd_card;
|
||||||
struct snd_soc_dai *dai = rtd->cpu_dai;
|
|
||||||
struct snd_pcm *pcm = rtd->pcm;
|
struct snd_pcm *pcm = rtd->pcm;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
|
@ -414,14 +413,14 @@ static int dma_new(struct snd_soc_pcm_runtime *rtd)
|
||||||
if (!card->dev->coherent_dma_mask)
|
if (!card->dev->coherent_dma_mask)
|
||||||
card->dev->coherent_dma_mask = 0xffffffff;
|
card->dev->coherent_dma_mask = 0xffffffff;
|
||||||
|
|
||||||
if (dai->driver->playback.channels_min) {
|
if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {
|
||||||
ret = preallocate_dma_buffer(pcm,
|
ret = preallocate_dma_buffer(pcm,
|
||||||
SNDRV_PCM_STREAM_PLAYBACK);
|
SNDRV_PCM_STREAM_PLAYBACK);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (dai->driver->capture.channels_min) {
|
if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) {
|
||||||
ret = preallocate_dma_buffer(pcm,
|
ret = preallocate_dma_buffer(pcm,
|
||||||
SNDRV_PCM_STREAM_CAPTURE);
|
SNDRV_PCM_STREAM_CAPTURE);
|
||||||
if (ret)
|
if (ret)
|
||||||
|
|
|
@ -387,7 +387,6 @@ static u64 idma_mask = DMA_BIT_MASK(32);
|
||||||
static int idma_new(struct snd_soc_pcm_runtime *rtd)
|
static int idma_new(struct snd_soc_pcm_runtime *rtd)
|
||||||
{
|
{
|
||||||
struct snd_card *card = rtd->card->snd_card;
|
struct snd_card *card = rtd->card->snd_card;
|
||||||
struct snd_soc_dai *dai = rtd->cpu_dai;
|
|
||||||
struct snd_pcm *pcm = rtd->pcm;
|
struct snd_pcm *pcm = rtd->pcm;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
|
@ -396,7 +395,7 @@ static int idma_new(struct snd_soc_pcm_runtime *rtd)
|
||||||
if (!card->dev->coherent_dma_mask)
|
if (!card->dev->coherent_dma_mask)
|
||||||
card->dev->coherent_dma_mask = DMA_BIT_MASK(32);
|
card->dev->coherent_dma_mask = DMA_BIT_MASK(32);
|
||||||
|
|
||||||
if (dai->driver->playback.channels_min)
|
if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {
|
||||||
ret = preallocate_idma_buffer(pcm,
|
ret = preallocate_idma_buffer(pcm,
|
||||||
SNDRV_PCM_STREAM_PLAYBACK);
|
SNDRV_PCM_STREAM_PLAYBACK);
|
||||||
|
|
||||||
|
|
|
@ -330,7 +330,6 @@ static u64 tegra_dma_mask = DMA_BIT_MASK(32);
|
||||||
static int tegra_pcm_new(struct snd_soc_pcm_runtime *rtd)
|
static int tegra_pcm_new(struct snd_soc_pcm_runtime *rtd)
|
||||||
{
|
{
|
||||||
struct snd_card *card = rtd->card->snd_card;
|
struct snd_card *card = rtd->card->snd_card;
|
||||||
struct snd_soc_dai *dai = rtd->cpu_dai;
|
|
||||||
struct snd_pcm *pcm = rtd->pcm;
|
struct snd_pcm *pcm = rtd->pcm;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
|
@ -339,14 +338,14 @@ static int tegra_pcm_new(struct snd_soc_pcm_runtime *rtd)
|
||||||
if (!card->dev->coherent_dma_mask)
|
if (!card->dev->coherent_dma_mask)
|
||||||
card->dev->coherent_dma_mask = 0xffffffff;
|
card->dev->coherent_dma_mask = 0xffffffff;
|
||||||
|
|
||||||
if (dai->driver->playback.channels_min) {
|
if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {
|
||||||
ret = tegra_pcm_preallocate_dma_buffer(pcm,
|
ret = tegra_pcm_preallocate_dma_buffer(pcm,
|
||||||
SNDRV_PCM_STREAM_PLAYBACK);
|
SNDRV_PCM_STREAM_PLAYBACK);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto err;
|
goto err;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (dai->driver->capture.channels_min) {
|
if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) {
|
||||||
ret = tegra_pcm_preallocate_dma_buffer(pcm,
|
ret = tegra_pcm_preallocate_dma_buffer(pcm,
|
||||||
SNDRV_PCM_STREAM_CAPTURE);
|
SNDRV_PCM_STREAM_CAPTURE);
|
||||||
if (ret)
|
if (ret)
|
||||||
|
|
Loading…
Reference in a new issue