diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-08 10:43:41 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-08 10:43:41 (GMT) |
| commit | 108145a60675ebc0e42e7964ee6666096bbf86ce (patch) | |
| tree | 19266ab0500d7bb188eb53634d484054d59473d2 /sound/soc/pxa | |
| parent | 022aa51e3fda0b3c6688defaa859961c11c36ec8 (diff) | |
| parent | bf4edea863c435c302041cf8bb01c8b3ca729449 (diff) | |
| download | linux-fsl-qoriq-108145a60675ebc0e42e7964ee6666096bbf86ce.tar.xz | |
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 d5340a0..c0d648d 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(); |