diff options
| author | Mark Brown | 2013-11-08 11:43:41 +0100 |
|---|---|---|
| committer | Mark Brown | 2013-11-08 11:43:41 +0100 |
| commit | 108145a60675ebc0e42e7964ee6666096bbf86ce (patch) | |
| tree | 19266ab0500d7bb188eb53634d484054d59473d2 /sound/soc/pxa | |
| parent | Merge remote-tracking branch 'asoc/topic/twl6040' into asoc-next (diff) | |
| parent | ASoC: dapm: Use WARN_ON() instead of BUG_ON() (diff) | |
| download | kernel-qcow2-linux-108145a60675ebc0e42e7964ee6666096bbf86ce.tar.gz kernel-qcow2-linux-108145a60675ebc0e42e7964ee6666096bbf86ce.tar.xz kernel-qcow2-linux-108145a60675ebc0e42e7964ee6666096bbf86ce.zip | |
Merge remote-tracking branch 'asoc/topic/warn' into asoc-next
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(); |