summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-05-03 09:30:29 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-05-03 09:30:29 +0100
commit9631c02e240236ec206394fb52380647d0e70e4f (patch)
tree086d0ba568addd791a7cec42a5ba6b7f8a1ea660 /sound
parent57669eaab2e9d347b1063fd57038ba26afba5882 (diff)
parent4495e46fe18f198366961bb2b324a694ef8a9b44 (diff)
downloadlinux-3.10-9631c02e240236ec206394fb52380647d0e70e4f.tar.gz
linux-3.10-9631c02e240236ec206394fb52380647d0e70e4f.tar.bz2
linux-3.10-9631c02e240236ec206394fb52380647d0e70e4f.zip
Merge remote-tracking branch 'asoc/fix/wm8994' into asoc-linus
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm8994.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index c9bd445c497..e5f96c98c5a 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -2841,6 +2841,7 @@ static int wm8994_aif3_hw_params(struct snd_pcm_substream *substream,
default:
return 0;
}
+ break;
default:
return 0;
}