Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5aad6c5f authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/asoc' into for-linus

parents 8cd1fd25 862af8ad

sound/soc/codecs/wm8580.c

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ 
static const u16 wm8580_reg[] = {

	0x0121, 0x017e, 0x007d, 0x0014, /*R3*/

	0x0121, 0x017e, 0x007d, 0x0194, /*R7*/

	0x001c, 0x0002, 0x0002, 0x00c2, /*R11*/

	0x0010, 0x0002, 0x0002, 0x00c2, /*R11*/

	0x0182, 0x0082, 0x000a, 0x0024, /*R15*/

	0x0009, 0x0000, 0x00ff, 0x0000, /*R19*/

	0x00ff, 0x00ff, 0x00ff, 0x00ff, /*R23*/

sound/soc/codecs/wm8904.c

+2 −1
Original line number Diff line number Diff line
@@ -818,7 +818,8 @@ static int wm8904_get_deemph(struct snd_kcontrol *kcontrol, 
	struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);

	struct wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec);



	return wm8904->deemph;

	ucontrol->value.enumerated.item[0] = wm8904->deemph;

	return 0;

}



static int wm8904_put_deemph(struct snd_kcontrol *kcontrol,

sound/soc/codecs/wm8955.c

+2 −1
Original line number Diff line number Diff line
@@ -380,7 +380,8 @@ static int wm8955_get_deemph(struct snd_kcontrol *kcontrol, 
	struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);

	struct wm8955_priv *wm8955 = snd_soc_codec_get_drvdata(codec);



	return wm8955->deemph;

	ucontrol->value.enumerated.item[0] = wm8955->deemph;

	return 0;

}



static int wm8955_put_deemph(struct snd_kcontrol *kcontrol,

sound/soc/codecs/wm8960.c

+2 −1
Original line number Diff line number Diff line
@@ -138,7 +138,8 @@ static int wm8960_get_deemph(struct snd_kcontrol *kcontrol, 
	struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);

	struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec);



	return wm8960->deemph;

	ucontrol->value.enumerated.item[0] = wm8960->deemph;

	return 0;

}



static int wm8960_put_deemph(struct snd_kcontrol *kcontrol,

sound/soc/soc-dapm.c

+3 −0
Original line number Diff line number Diff line
@@ -944,6 +944,9 @@ static int dapm_power_widgets(struct snd_soc_codec *codec, int event) 
		case SND_SOC_DAPM_STREAM_RESUME:

			sys_power = 1;

			break;

		case SND_SOC_DAPM_STREAM_STOP:

			sys_power = !!codec->active;

			break;

		case SND_SOC_DAPM_STREAM_SUSPEND:

			sys_power = 0;

			break;