diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-10-04 10:44:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-10-04 10:44:43 -0400 |
| commit | 5d224e8f184ee2af6de6a7204e198f3a7d36e8a2 (patch) | |
| tree | e07cb9b0c0579ecdabd7975129f47ece7786734c /sound/soc/codecs/wm8994.c | |
| parent | 734787550a60b768b675c26f93d134f6dc370bb5 (diff) | |
| parent | c527e6aadc8f142ad388b6aa59a1ce6a4bfb1966 (diff) | |
Merge branch 'for-3.1' into for-3.2
Diffstat (limited to 'sound/soc/codecs/wm8994.c')
| -rw-r--r-- | sound/soc/codecs/wm8994.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 546173f36269..16542de21db8 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c | |||
| @@ -2448,7 +2448,7 @@ static void wm8994_aif_shutdown(struct snd_pcm_substream *substream, | |||
| 2448 | rate_reg = WM8994_AIF1_RATE; | 2448 | rate_reg = WM8994_AIF1_RATE; |
| 2449 | break; | 2449 | break; |
| 2450 | case 2: | 2450 | case 2: |
| 2451 | rate_reg = WM8994_AIF1_RATE; | 2451 | rate_reg = WM8994_AIF2_RATE; |
| 2452 | break; | 2452 | break; |
| 2453 | default: | 2453 | default: |
| 2454 | break; | 2454 | break; |