diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 13:53:16 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 13:53:16 +1100 |
| commit | 9b1ae840c852a231f37bdd55f3893a1874e50ad2 (patch) | |
| tree | a3b0aee567d1d66fa94fb3abdf65ede601791793 /sound | |
| parent | afd11331c44381e8fdfab9e8b82c392716d9d87d (diff) | |
| parent | e1412e636eeb84023b79e525909b366a9b28a185 (diff) | |
Merge remote-tracking branch 'sound-asoc/for-next'
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/tegra/tegra_pcm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/tegra/tegra_pcm.c b/sound/soc/tegra/tegra_pcm.c index 40540b175f5e..3c271f953582 100644 --- a/sound/soc/tegra/tegra_pcm.c +++ b/sound/soc/tegra/tegra_pcm.c @@ -161,8 +161,8 @@ static int tegra_pcm_open(struct snd_pcm_substream *substream) prtd->dma_req[1].dev = prtd; prtd->dma_chan = tegra_dma_allocate_channel(TEGRA_DMA_MODE_ONESHOT); - if (IS_ERR(prtd->dma_chan)) { - ret = PTR_ERR(prtd->dma_chan); + if (prtd->dma_chan == NULL) { + ret = -ENOMEM; goto err; } |