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

Commit 7cf0a953 authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files

[ALSA] Fix compile errors with older gcc 



Fixed compile errors with older gcc for initialization of a union.
sound/pci/ca0106/ca0106_mixer.c: At top level:
sound/pci/ca0106/ca0106_mixer.c:499: unknown field 'p' specified in initializer
sound/pci/ca0106/ca0106_mixer.c:499: warning: missing braces around initializer
sound/pci/ca0106/ca0106_mixer.c:499: warning: (near initialization for 'snd_ca0106_volume_ctls[0].tlv')

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent 99ccc560

sound/pci/ca0106/ca0106_mixer.c

+2 −2
Original line number Diff line number Diff line
@@ -478,7 +478,7 @@ static int snd_ca0106_i2c_volume_put(struct snd_kcontrol *kcontrol, 
	.info =	 snd_ca0106_volume_info,			\

	.get =   snd_ca0106_volume_get,				\

	.put =   snd_ca0106_volume_put,				\

	.tlv.p = snd_ca0106_db_scale1,				\

	.tlv = { .p = snd_ca0106_db_scale1 },			\

	.private_value = ((chid) << 8) | (reg)			\

}
@@ -490,7 +490,7 @@ static int snd_ca0106_i2c_volume_put(struct snd_kcontrol *kcontrol, 
	.info =  snd_ca0106_i2c_volume_info,			\

	.get =   snd_ca0106_i2c_volume_get,			\

	.put =   snd_ca0106_i2c_volume_put,			\

	.tlv.p = snd_ca0106_db_scale2,				\

	.tlv = { .p = snd_ca0106_db_scale2 },			\

	.private_value = chid					\

}

sound/pci/emu10k1/p16v.c

+1 −1
Original line number Diff line number Diff line
@@ -794,7 +794,7 @@ static DECLARE_TLV_DB_SCALE(snd_p16v_db_scale1, -5175, 25, 1); 
	.info = snd_p16v_volume_info, \

	.get = snd_p16v_volume_get, \

	.put = snd_p16v_volume_put, \

	.tlv.p = snd_p16v_db_scale1, \

	.tlv = { .p = snd_p16v_db_scale1 },	\

	.private_value = ((xreg) | ((xhl) << 8)) \

}

sound/pci/hda/hda_local.h

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
	  .info = snd_hda_mixer_amp_volume_info, \

	  .get = snd_hda_mixer_amp_volume_get, \

	  .put = snd_hda_mixer_amp_volume_put, \

	  .tlv.c = snd_hda_mixer_amp_tlv, \

	  .tlv = { .c = snd_hda_mixer_amp_tlv },		\

	  .private_value = HDA_COMPOSE_AMP_VAL(nid, channel, xindex, direction) }

/* stereo volume with index */

#define HDA_CODEC_VOLUME_IDX(xname, xcidx, nid, xindex, direction) \

sound/pci/hda/patch_analog.c

+1 −1
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ static struct snd_kcontrol_new ad1986a_mixers[] = { 
		.info = ad1986a_pcm_amp_vol_info,

		.get = ad1986a_pcm_amp_vol_get,

		.put = ad1986a_pcm_amp_vol_put,

		.tlv.c = ad1986a_pcm_amp_tlv,

		.tlv = { .c = ad1986a_pcm_amp_tlv },

		.private_value = HDA_COMPOSE_AMP_VAL(AD1986A_FRONT_DAC, 3, 0, HDA_OUTPUT)

	},

	{