Merge branch 'for-3.1' into for-3.2

5d224e8f · Mark Brown · 73478755 · c527e6aa · 5d224e8f
Commit 5d224e8f authored Oct 04, 2011 by Mark Brown
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sound/soc/codecs/wm8994.c sound/soc/codecs/wm8994.c +1 -1

No files found.
--- 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,
 		rate_reg = WM8994_AIF1_RATE;
 		break;
 	case 2:
-		rate_reg = WM8994_AIF1_RATE;
+		rate_reg = WM8994_AIF2_RATE;
 		break;
 	default:
 		break;