diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-11-05 18:39:57 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-06 10:26:57 +0000 |
| commit | 246e884b82305c5669a892c04e67864f4e7c10d5 (patch) | |
| tree | 69ae768fe584cf7e826bb23a571d11616a7b175b /sound/soc | |
| parent | 22a7038c3950a7a4c4d1656a04c3ca8da8296324 (diff) | |
| download | op-kernel-dev-246e884b82305c5669a892c04e67864f4e7c10d5.zip op-kernel-dev-246e884b82305c5669a892c04e67864f4e7c10d5.tar.gz | |
ASoC: wm8900: 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')
| -rw-r--r-- | sound/soc/codecs/wm8900.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8900.c b/sound/soc/codecs/wm8900.c index 7c8257c..de67e74 100644 --- a/sound/soc/codecs/wm8900.c +++ b/sound/soc/codecs/wm8900.c @@ -691,7 +691,8 @@ static int fll_factors(struct _fll_div *fll_div, unsigned int Fref, unsigned int K, Ndiv, Nmod, target; unsigned int div; - BUG_ON(!Fout); + if (WARN_ON(!Fout)) + return -EINVAL; /* The FLL must run at 90-100MHz which is then scaled down to * the output value by FLLCLK_DIV. */ @@ -742,8 +743,9 @@ static int fll_factors(struct _fll_div *fll_div, unsigned int Fref, /* Move down to proper range now rounding is done */ fll_div->k = K / 10; - BUG_ON(target != Fout * (fll_div->fllclk_div << 2)); - BUG_ON(!K && target != Fref * fll_div->fll_ratio * fll_div->n); + if (WARN_ON(target != Fout * (fll_div->fllclk_div << 2)) || + WARN_ON(!K && target != Fref * fll_div->fll_ratio * fll_div->n)) + return -EINVAL; return 0; } |
