summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-10-24 11:23:59 +0100
committerMark Brown <broonie@linaro.org>2013-10-24 11:23:59 +0100
commit805c6055620c14b2f966b83f87bbbaeeffae2fa5 (patch)
treefd6270019cd18f0bb784a2f099d912f903749c91 /sound
parentbb80a5d4cdbc0e59c7d15fb1f728d6e8536e1857 (diff)
parent0feb23d1bdf31db903069d3d94892e56b5c11981 (diff)
Merge remote-tracking branch 'asoc/topic/ak4642' into asoc-next
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/ak4642.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/codecs/ak4642.c b/sound/soc/codecs/ak4642.c
index 2d0378709702..21c35ed778cc 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);