diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-08 05:43:41 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-08 05:43:41 -0500 |
| commit | 108145a60675ebc0e42e7964ee6666096bbf86ce (patch) | |
| tree | 19266ab0500d7bb188eb53634d484054d59473d2 /sound/soc/codecs/wm8350.c | |
| parent | 022aa51e3fda0b3c6688defaa859961c11c36ec8 (diff) | |
| parent | bf4edea863c435c302041cf8bb01c8b3ca729449 (diff) | |
Merge remote-tracking branch 'asoc/topic/warn' into asoc-next
Diffstat (limited to 'sound/soc/codecs/wm8350.c')
| -rw-r--r-- | sound/soc/codecs/wm8350.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c index af1318ddb062..a183dcf3d5c1 100644 --- a/sound/soc/codecs/wm8350.c +++ b/sound/soc/codecs/wm8350.c | |||
| @@ -274,7 +274,7 @@ static int pga_event(struct snd_soc_dapm_widget *w, | |||
| 274 | break; | 274 | break; |
| 275 | 275 | ||
| 276 | default: | 276 | default: |
| 277 | BUG(); | 277 | WARN(1, "Invalid shift %d\n", w->shift); |
| 278 | return -1; | 278 | return -1; |
| 279 | } | 279 | } |
| 280 | 280 | ||