Merge branch 'for-3.1' into for-3.2

This commit is contained in:
Mark Brown 2011-10-04 15:44:43 +01:00
commit 5d224e8f18

View File

@ -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;