Merge branch 'for-3.1' into for-3.2

git-mirror · Oct 4, 2011 · 5d224e8 · 5d224e8
2 parents 7347875 + c527e6a
commit 5d224e8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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;