From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 28 Dec 2010 23:42:53 +0000 (+0000)
Subject: Merge branch 'for-2.6.37' into for-2.6.38
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=22a756ee8951e597c76e5a60f81d40a43054489e;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'for-2.6.37' into for-2.6.38
---

22a756ee8951e597c76e5a60f81d40a43054489e
diff --cc sound/soc/codecs/wm8753.c
index 73507e71cb79,87caae59e939..79b02ae125c5
--- a/sound/soc/codecs/wm8753.c
+++ b/sound/soc/codecs/wm8753.c
@@@ -1286,13 -1239,13 +1239,13 @@@ static int wm8753_set_bias_level(struc
  		break;
  	case SND_SOC_BIAS_STANDBY:
  		/* mute dac and set vmid to 500k, enable VREF */
- 		wm8753_write(codec, WM8753_PWR1, pwr_reg | 0x0141);
+ 		snd_soc_write(codec, WM8753_PWR1, pwr_reg | 0x0141);
  		break;
  	case SND_SOC_BIAS_OFF:
- 		wm8753_write(codec, WM8753_PWR1, 0x0001);
+ 		snd_soc_write(codec, WM8753_PWR1, 0x0001);
  		break;
  	}
 -	codec->bias_level = level;
 +	codec->dapm.bias_level = level;
  	return 0;
  }
  
@@@ -1531,9 -1479,28 +1481,9 @@@ static int wm8753_resume(struct snd_soc
  static int wm8753_probe(struct snd_soc_codec *codec)
  {
  	struct wm8753_priv *wm8753 = snd_soc_codec_get_drvdata(codec);
- 	int ret = 0, reg;
+ 	int ret;
  
 -	INIT_DELAYED_WORK(&codec->delayed_work, wm8753_work);
 +	INIT_DELAYED_WORK(&codec->dapm.delayed_work, wm8753_work);
  
  	ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8753->control_type);
  	if (ret < 0) {