Merge branch 'linus' into x86/x2apic

Conflicts:
	arch/x86/kernel/cpu/cyrix.c
	include/asm-x86/cpufeature.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 4 insertions, 0 deletions

diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c
index 7c8ae31eb468..c5829d30ef86 100644
--- a/sound/pci/oxygen/oxygen.c
+++ b/sound/pci/oxygen/oxygen.c
@@ -28,6 +28,7 @@
  * GPIO 1 -> DFS1 of AK5385
  */
 
+#include <linux/delay.h>
 #include <linux/mutex.h>
 #include <linux/pci.h>
 #include <sound/ac97_codec.h>
@@ -213,6 +214,9 @@ static void set_ak4396_params(struct oxygen *chip,
         else
                 value |= AK4396_DFS_QUAD;
         data->ak4396_ctl2 = value;
+
+        msleep(1); /* wait for the new MCLK to become stable */
+
         for (i = 0; i < 4; ++i) {
                 ak4396_write(chip, i,
                              AK4396_CONTROL_1, AK4396_DIF_24_MSB);