tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'fix/asoc' into for-linus

Takashi Iwai 5aad6c5f 8cd1fd25

+10 -4
unified split
+1 -1
sound/soc/codecs/wm8580.c
··· 161 161 static const u16 wm8580_reg[] = { 162 162 0x0121, 0x017e, 0x007d, 0x0014, /*R3*/ 163 163 0x0121, 0x017e, 0x007d, 0x0194, /*R7*/ 164 - 0x001c, 0x0002, 0x0002, 0x00c2, /*R11*/ 164 + 0x0010, 0x0002, 0x0002, 0x00c2, /*R11*/ 165 165 0x0182, 0x0082, 0x000a, 0x0024, /*R15*/ 166 166 0x0009, 0x0000, 0x00ff, 0x0000, /*R19*/ 167 167 0x00ff, 0x00ff, 0x00ff, 0x00ff, /*R23*/
+2 -1
sound/soc/codecs/wm8904.c
··· 818 818 struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); 819 819 struct wm8904_priv *wm8904 = snd_soc_codec_get_drvdata(codec); 820 820 821 - return wm8904->deemph; 821 + ucontrol->value.enumerated.item[0] = wm8904->deemph; 822 + return 0; 822 823 } 823 824 824 825 static int wm8904_put_deemph(struct snd_kcontrol *kcontrol,
+2 -1
sound/soc/codecs/wm8955.c
··· 380 380 struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); 381 381 struct wm8955_priv *wm8955 = snd_soc_codec_get_drvdata(codec); 382 382 383 - return wm8955->deemph; 383 + ucontrol->value.enumerated.item[0] = wm8955->deemph; 384 + return 0; 384 385 } 385 386 386 387 static int wm8955_put_deemph(struct snd_kcontrol *kcontrol,
+2 -1
sound/soc/codecs/wm8960.c
··· 138 138 struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); 139 139 struct wm8960_priv *wm8960 = snd_soc_codec_get_drvdata(codec); 140 140 141 - return wm8960->deemph; 141 + ucontrol->value.enumerated.item[0] = wm8960->deemph; 142 + return 0; 142 143 } 143 144 144 145 static int wm8960_put_deemph(struct snd_kcontrol *kcontrol,
+3
sound/soc/soc-dapm.c
··· 944 944 case SND_SOC_DAPM_STREAM_RESUME: 945 945 sys_power = 1; 946 946 break; 947 + case SND_SOC_DAPM_STREAM_STOP: 948 + sys_power = !!codec->active; 949 + break; 947 950 case SND_SOC_DAPM_STREAM_SUSPEND: 948 951 sys_power = 0; 949 952 break;