diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-11-08 16:45:38 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-11-08 16:45:38 +0100 |
| commit | a6bc732b5a96b5403c2637e85c350b95ec6591f3 (patch) | |
| tree | 4b1c3967cd1de42a5e36e567cbdd18e1f4e8446f /sound/soc/pxa | |
| parent | 9a22a8f558d09a83965d2bbe168294eb8ffb70e9 (diff) | |
| parent | dd212bd5bb8b15889821ef79213cdb5bd47c6f85 (diff) | |
| download | blackbird-op-linux-a6bc732b5a96b5403c2637e85c350b95ec6591f3.tar.gz blackbird-op-linux-a6bc732b5a96b5403c2637e85c350b95ec6591f3.zip | |
Merge tag 'asoc-v3.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v3.13
Some additional fixes for v3.13, the majority of which are removals and
downgrades of BUG()s from Takashi.
Diffstat (limited to 'sound/soc/pxa')
| -rw-r--r-- | sound/soc/pxa/pxa2xx-i2s.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c index d5340a088858..c0d648d3339f 100644 --- a/sound/soc/pxa/pxa2xx-i2s.c +++ b/sound/soc/pxa/pxa2xx-i2s.c @@ -165,7 +165,8 @@ static int pxa2xx_i2s_hw_params(struct snd_pcm_substream *substream, { struct snd_dmaengine_dai_dma_data *dma_data; - BUG_ON(IS_ERR(clk_i2s)); + if (WARN_ON(IS_ERR(clk_i2s))) + return -EINVAL; clk_prepare_enable(clk_i2s); clk_ena = 1; pxa_i2s_wait(); |
