Merge source.mvista.com:/home/git/linux-omap-2.6

arch/arm/mach-omap1/board-nokia770.c

@@ -194,6 +194,7 @@ static void codec_delayed_power_down(void *arg)
 	down(&audio_pwr_sem);
 	if (audio_pwr_state == -1)
 		tlv320aic23_power_down();
+	clk_disable(dspxor_ck);
 	up(&audio_pwr_sem);
 }
 
@@ -201,8 +202,6 @@ static DECLARE_WORK(codec_power_down_work, codec_delayed_power_down, NULL);
 
 static void nokia770_audio_pwr_down(void)
 {
-	clk_disable(dspxor_ck);
-
 	/* Turn off amplifier */
 	omap_set_gpio_dataout(AMPLIFIER_CTRL_GPIO, 0);