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

[ALSA] Skip ac97 SPDIF controls 



CA0106 driver
Skip building ac97 SPDIF controls via AC97_SCAP_NO_SPDIF.
Clean up the code.

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

sound/pci/ca0106/ca0106_main.c

+1 −0
Original line number Diff line number Diff line
@@ -810,6 +810,7 @@ static int snd_ca0106_ac97(ca0106_t *chip) 


	memset(&ac97, 0, sizeof(ac97));

	ac97.private_data = chip;

	ac97.scaps = AC97_SCAP_NO_SPDIF;

	return snd_ac97_mixer(pbus, &ac97, &chip->ac97);

}

sound/pci/ca0106/ca0106_mixer.c

+0 −5
Original line number Diff line number Diff line
@@ -620,11 +620,6 @@ int __devinit snd_ca0106_mixer(ca0106_t *emu) 
		return -ENOMEM;

	if ((err = snd_ctl_add(card, kctl)))

		return err;

	if ((kctl = ctl_find(card, SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT))) != NULL) {

		/* already defined by ac97, remove it */

		/* FIXME: or do we need both controls? */

		remove_ctl(card, SNDRV_CTL_NAME_IEC958("",PLAYBACK,DEFAULT));

	}

	if ((kctl = snd_ctl_new1(&snd_ca0106_spdif_control, emu)) == NULL)

		return -ENOMEM;

	if ((err = snd_ctl_add(card, kctl)))

CRA Git | Maintained and supported by SUSTech CRA and CCSE