diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-07-15 22:34:58 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-07-17 00:15:20 -0400 |
| commit | ca1004bab9c6829e64036f7da5e25a698756ee28 (patch) | |
| tree | cc7fa9199cddbe119c75654331f36fea2cd26142 | |
| parent | f0f5039c3dcc6f80756128aa38f2a4f5b895bbf1 (diff) | |
ASoC: Report an error for unknown adav80x formats
Not only fixes error handling but also some uninitialized variable
warnings.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
| -rw-r--r-- | sound/soc/codecs/adav80x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/adav80x.c b/sound/soc/codecs/adav80x.c index e30fba62392d..300c04b70e71 100644 --- a/sound/soc/codecs/adav80x.c +++ b/sound/soc/codecs/adav80x.c | |||
| @@ -456,7 +456,7 @@ static int adav80x_set_capture_pcm_format(struct snd_soc_codec *codec, | |||
| 456 | val = ADAV80X_CAPTURE_WORD_LEN24; | 456 | val = ADAV80X_CAPTURE_WORD_LEN24; |
| 457 | break; | 457 | break; |
| 458 | default: | 458 | default: |
| 459 | break; | 459 | return -EINVAL; |
| 460 | } | 460 | } |
| 461 | 461 | ||
| 462 | snd_soc_update_bits(codec, adav80x_port_ctrl_regs[dai->id][0], | 462 | snd_soc_update_bits(codec, adav80x_port_ctrl_regs[dai->id][0], |
| @@ -488,7 +488,7 @@ static int adav80x_set_playback_pcm_format(struct snd_soc_codec *codec, | |||
| 488 | val = ADAV80X_PLAYBACK_MODE_RIGHT_J_24; | 488 | val = ADAV80X_PLAYBACK_MODE_RIGHT_J_24; |
| 489 | break; | 489 | break; |
| 490 | default: | 490 | default: |
| 491 | break; | 491 | return -EINVAL; |
| 492 | } | 492 | } |
| 493 | 493 | ||
| 494 | snd_soc_update_bits(codec, adav80x_port_ctrl_regs[dai->id][1], | 494 | snd_soc_update_bits(codec, adav80x_port_ctrl_regs[dai->id][1], |
