Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 8b14719bebfe022f3637c323e76c88b2bc061a61

Authored by Takashi Iwai
Committed by Mark Brown
1 parent 4a318f1e6c
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

ASoC: rcar: Use WARN_ON() instead of BUG_ON() 

Use WARN_ON() and handle the error cases accordingly.

Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Mark Brown <broonie@linaro.org>

Showing 2 changed files with 4 additions and 2 deletions Side-by-side Diff

sound/soc/sh/rcar/scu.c
Diff comments   View file @ 8b14719
... ... @@ -192,7 +192,8 @@
192 192  
193 193 struct rsnd_mod *rsnd_scu_mod_get(struct rsnd_priv *priv, int id)
194 194 {
195   - BUG_ON(id < 0 || id >= rsnd_scu_nr(priv));
  195 + if (WARN_ON(id < 0 || id >= rsnd_scu_nr(priv)))
  196 + id = 0;
196 197  
197 198 return &((struct rsnd_scu *)(priv->scu) + id)->mod;
198 199 }
sound/soc/sh/rcar/ssi.c
Diff comments   View file @ 8b14719
... ... @@ -619,7 +619,8 @@
619 619  
620 620 struct rsnd_mod *rsnd_ssi_mod_get(struct rsnd_priv *priv, int id)
621 621 {
622   - BUG_ON(id < 0 || id >= rsnd_ssi_nr(priv));
  622 + if (WARN_ON(id < 0 || id >= rsnd_ssi_nr(priv)))
  623 + id = 0;
623 624  
624 625 return &(((struct rsnd_ssiu *)(priv->ssiu))->ssi + id)->mod;
625 626 }