Merge remote-tracking branch 'asoc/topic/warn' into asoc-next

[~andy/linux] / sound / soc / sh / rcar / ssi.c

diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
index b71cf9d7dd3febe600465b40cdc5dcaaedb5b6fb..5ac20cd5e00607efd0b8113fc85aec9ed97f57f4 100644 (file)
--- a/sound/soc/sh/rcar/ssi.c
+++ b/sound/soc/sh/rcar/ssi.c
@@ -611,7 +611,8 @@ struct rsnd_mod *rsnd_ssi_mod_get_frm_dai(struct rsnd_priv *priv,
 
 struct rsnd_mod *rsnd_ssi_mod_get(struct rsnd_priv *priv, int id)
 {
-       BUG_ON(id < 0 || id >= rsnd_ssi_nr(priv));
+       if (WARN_ON(id < 0 || id >= rsnd_ssi_nr(priv)))
+               id = 0;
 
        return &(((struct rsnd_ssiu *)(priv->ssiu))->ssi + id)->mod;
 }