Merge branch 'fix/asoc' into for-linus (2c3b9b50) · Commits · e / devices / android_kernel_fairphone_FP5

sound/soc/codecs/ak4642.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -470,7 +470,7 @@ EXPORT_SYMBOL_GPL(soc_codec_dev_ak4642);

		static int __init ak4642_modinit(void)
		{
		int ret;
		int ret = 0;
		#if defined(CONFIG_I2C) \|\| defined(CONFIG_I2C_MODULE)
		ret = i2c_add_driver(&ak4642_i2c_driver);
		#endif

+1 −17

Original line number	Diff line number	Diff line
		@@ -191,6 +191,7 @@ static int ac97_analog_prepare(struct snd_pcm_substream *substream,
		vra = stac9766_ac97_read(codec, AC97_EXTENDED_STATUS);

		vra \|= 0x1; /* enable variable rate audio */
		vra &= ~0x4; /* disable SPDIF output */

		stac9766_ac97_write(codec, AC97_EXTENDED_STATUS, vra);

		@@ -221,22 +222,6 @@ static int ac97_digital_prepare(struct snd_pcm_substream *substream,
		return stac9766_ac97_write(codec, reg, runtime->rate);
		}

		static int ac97_digital_trigger(struct snd_pcm_substream *substream,
		int cmd, struct snd_soc_dai *dai)
		{
		struct snd_soc_codec *codec = dai->codec;
		unsigned short vra;

		switch (cmd) {
		case SNDRV_PCM_TRIGGER_STOP:
		vra = stac9766_ac97_read(codec, AC97_EXTENDED_STATUS);
		vra &= !0x04;
		stac9766_ac97_write(codec, AC97_EXTENDED_STATUS, vra);
		break;
		}
		return 0;
		}

		static int stac9766_set_bias_level(struct snd_soc_codec *codec,
		enum snd_soc_bias_level level)
		{
		@@ -315,7 +300,6 @@ static struct snd_soc_dai_ops stac9766_dai_ops_analog = {

		static struct snd_soc_dai_ops stac9766_dai_ops_digital = {
		.prepare = ac97_digital_prepare,
		.trigger = ac97_digital_trigger,
		};

		struct snd_soc_dai stac9766_dai[] = {

+1 −1

Original line number	Diff line number	Diff line
		@@ -47,7 +47,7 @@ static const u16 wm8974_reg[WM8974_CACHEREGNUM] = {
		};

		#define WM8974_POWER1_BIASEN 0x08
		#define WM8974_POWER1_BUFIOEN 0x10
		#define WM8974_POWER1_BUFIOEN 0x04

		struct wm8974_priv {
		struct snd_soc_codec codec;