summaryrefslogtreecommitdiffstats
path: root/sound/soc/s6000
diff options
context:
space:
mode:
authorTakashi Iwai2013-11-05 18:40:04 +0100
committerMark Brown2013-11-07 20:55:16 +0100
commit4a318f1e6c4331633a91ad67b782860c76d8894b (patch)
treec4ee56f6f60519447cbb1d5ed5e2c7f892bbf188 /sound/soc/s6000
parentASoC: pxa: Use WARN_ON() instead of BUG_ON() (diff)
downloadkernel-qcow2-linux-4a318f1e6c4331633a91ad67b782860c76d8894b.tar.gz
kernel-qcow2-linux-4a318f1e6c4331633a91ad67b782860c76d8894b.tar.xz
kernel-qcow2-linux-4a318f1e6c4331633a91ad67b782860c76d8894b.zip
ASoC: s6000: 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/s6000')
-rw-r--r--sound/soc/s6000/s6000-pcm.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/s6000/s6000-pcm.c b/sound/soc/s6000/s6000-pcm.c
index d0740a762963..5cfaa5464eba 100644
--- a/sound/soc/s6000/s6000-pcm.c
+++ b/sound/soc/s6000/s6000-pcm.c
@@ -90,7 +90,8 @@ static void s6000_pcm_enqueue_dma(struct snd_pcm_substream *substream)
return;
}
- BUG_ON(period_size & 15);
+ if (WARN_ON(period_size & 15))
+ return;
s6dmac_put_fifo(DMA_MASK_DMAC(channel), DMA_INDEX_CHNL(channel),
src, dst, period_size);