diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-08 10:43:22 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-08 10:43:22 +0000 |
| commit | 74858f23ca3e2765a10e9f42869c753c0f1ec6b1 (patch) | |
| tree | e051f7f787dc870248846279dbc907c233b177c6 /sound | |
| parent | 5176dfcd47327cbee4009e2372cd1ae0710313db (diff) | |
| parent | 0feb23d1bdf31db903069d3d94892e56b5c11981 (diff) | |
| download | blackbird-op-linux-74858f23ca3e2765a10e9f42869c753c0f1ec6b1.tar.gz blackbird-op-linux-74858f23ca3e2765a10e9f42869c753c0f1ec6b1.zip | |
Merge remote-tracking branch 'asoc/topic/ak4642' into asoc-next
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/ak4642.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c index 687565d08d9c..090d499bb7eb 100644 --- a/sound/soc/codecs/ak4642.c +++ b/sound/soc/codecs/ak4642.c @@ -352,7 +352,6 @@ static int ak4642_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) */ default: return -EINVAL; - break; } snd_soc_update_bits(codec, MD_CTL1, DIF_MASK, data); @@ -405,7 +404,6 @@ static int ak4642_dai_hw_params(struct snd_pcm_substream *substream, break; default: return -EINVAL; - break; } snd_soc_update_bits(codec, MD_CTL2, FS_MASK, rate); |
