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

ALSA: ice1712,ice1724: fix the kcontrol->id initialization 



The new xarray lookup code requires to know complete kcontrol->id before
snd_ctl_add() call. Reorder the code to make the initialization properly.

Cc: stable@kernel.org # v5.19+
Reported-by: default avatarMartin Zidek <zidek@master.cz>
Signed-off-by: default avatarJaroslav Kysela <perex@perex.cz>
Link: https://lore.kernel.org/r/20230606073122.597491-1-perex@perex.cz


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent da209f7a

sound/pci/ice1712/aureon.c

+4 −3
Original line number Diff line number Diff line
@@ -1899,11 +1899,12 @@ static int aureon_add_controls(struct snd_ice1712 *ice) 
		else {

			for (i = 0; i < ARRAY_SIZE(cs8415_controls); i++) {

				struct snd_kcontrol *kctl;

				err = snd_ctl_add(ice->card, (kctl = snd_ctl_new1(&cs8415_controls[i], ice)));

				if (err < 0)

					return err;

				kctl = snd_ctl_new1(&cs8415_controls[i], ice);

				if (i > 1)

					kctl->id.device = ice->pcm->device;

				err = snd_ctl_add(ice->card, kctl);

				if (err < 0)

					return err;

			}

		}

	}

sound/pci/ice1712/ice1712.c

+9 −5
Original line number Diff line number Diff line
@@ -2371,22 +2371,26 @@ int snd_ice1712_spdif_build_controls(struct snd_ice1712 *ice) 


	if (snd_BUG_ON(!ice->pcm_pro))

		return -EIO;

	err = snd_ctl_add(ice->card, kctl = snd_ctl_new1(&snd_ice1712_spdif_default, ice));

	kctl = snd_ctl_new1(&snd_ice1712_spdif_default, ice);

	kctl->id.device = ice->pcm_pro->device;

	err = snd_ctl_add(ice->card, kctl);

	if (err < 0)

		return err;

	kctl = snd_ctl_new1(&snd_ice1712_spdif_maskc, ice);

	kctl->id.device = ice->pcm_pro->device;

	err = snd_ctl_add(ice->card, kctl = snd_ctl_new1(&snd_ice1712_spdif_maskc, ice));

	err = snd_ctl_add(ice->card, kctl);

	if (err < 0)

		return err;

	kctl = snd_ctl_new1(&snd_ice1712_spdif_maskp, ice);

	kctl->id.device = ice->pcm_pro->device;

	err = snd_ctl_add(ice->card, kctl = snd_ctl_new1(&snd_ice1712_spdif_maskp, ice));

	err = snd_ctl_add(ice->card, kctl);

	if (err < 0)

		return err;

	kctl = snd_ctl_new1(&snd_ice1712_spdif_stream, ice);

	kctl->id.device = ice->pcm_pro->device;

	err = snd_ctl_add(ice->card, kctl = snd_ctl_new1(&snd_ice1712_spdif_stream, ice));

	err = snd_ctl_add(ice->card, kctl);

	if (err < 0)

		return err;

	kctl->id.device = ice->pcm_pro->device;

	ice->spdif.stream_ctl = kctl;

	return 0;

}

sound/pci/ice1712/ice1724.c

+10 −6
Original line number Diff line number Diff line
@@ -2392,23 +2392,27 @@ static int snd_vt1724_spdif_build_controls(struct snd_ice1712 *ice) 
	if (err < 0)

		return err;



	err = snd_ctl_add(ice->card, kctl = snd_ctl_new1(&snd_vt1724_spdif_default, ice));

	kctl = snd_ctl_new1(&snd_vt1724_spdif_default, ice);

	kctl->id.device = ice->pcm->device;

	err = snd_ctl_add(ice->card, kctl);

	if (err < 0)

		return err;

	kctl = snd_ctl_new1(&snd_vt1724_spdif_maskc, ice);

	kctl->id.device = ice->pcm->device;

	err = snd_ctl_add(ice->card, kctl = snd_ctl_new1(&snd_vt1724_spdif_maskc, ice));

	err = snd_ctl_add(ice->card, kctl);

	if (err < 0)

		return err;

	kctl = snd_ctl_new1(&snd_vt1724_spdif_maskp, ice);

	kctl->id.device = ice->pcm->device;

	err = snd_ctl_add(ice->card, kctl = snd_ctl_new1(&snd_vt1724_spdif_maskp, ice));

	err = snd_ctl_add(ice->card, kctl);

	if (err < 0)

		return err;

	kctl->id.device = ice->pcm->device;

#if 0 /* use default only */

	err = snd_ctl_add(ice->card, kctl = snd_ctl_new1(&snd_vt1724_spdif_stream, ice));

	kctl = snd_ctl_new1(&snd_vt1724_spdif_stream, ice);

	kctl->id.device = ice->pcm->device;

	err = snd_ctl_add(ice->card, kctl);

	if (err < 0)

		return err;

	kctl->id.device = ice->pcm->device;

	ice->spdif.stream_ctl = kctl;

#endif

	return 0;