summaryrefslogtreecommitdiffstats
path: root/sound/soc/pxa
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-11-05 18:40:03 +0100
committerMark Brown <broonie@linaro.org>2013-11-07 19:55:15 +0000
commit8a2e2c86e979a9b3a53e880be65d5fd12820b932 (patch)
tree2a0b3503342b657593f8a9ae35b5b1a494eb7d68 /sound/soc/pxa
parent96b61bc546519ae90317980294c161c86bcd140e (diff)
downloadlinux-8a2e2c86e979a9b3a53e880be65d5fd12820b932.tar.gz
linux-8a2e2c86e979a9b3a53e880be65d5fd12820b932.tar.bz2
linux-8a2e2c86e979a9b3a53e880be65d5fd12820b932.zip
ASoC: pxa: Use WARN_ON() instead of BUG_ON()
Use WARN_ON() and handle the error cases accordingly. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/pxa')
-rw-r--r--sound/soc/pxa/pxa2xx-i2s.c3
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();