From 99c91578a65587784cc05e98760225e7f8f7ddc8 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 24 Mar 2005 17:48:30 +0100 Subject: [PATCH] --- yaml --- r: 1471 b: refs/heads/master c: 36c4dc42249e96f0b0ddc90ca400bcb3981dbc62 h: refs/heads/master i: 1469: 35972ae47e26fffcec7cf77c32deeceaa549d902 1467: f938494cd0e71d094e8e236788c362fd5b796ac6 1463: d59544405a320005cec2f4bcb71ade9e446450fb 1455: b9b39ecaf12f11bc57a1c5aadbc6ad9dfff5eddd 1439: d6069689137c1bc9ae6ca3dea05b0f64885ab373 1407: 93b468b0b49d38cca16135e3618e1be22670a054 v: v3 --- [refs] | 2 +- trunk/sound/pci/ca0106/ca0106_main.c | 1 + trunk/sound/pci/ca0106/ca0106_mixer.c | 5 ----- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 67f027ff5c97..168d2d02289e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c301098233bdbaae369bfdd98207db916df8cef2 +refs/heads/master: 36c4dc42249e96f0b0ddc90ca400bcb3981dbc62 diff --git a/trunk/sound/pci/ca0106/ca0106_main.c b/trunk/sound/pci/ca0106/ca0106_main.c index 82533b45bc8c..901e42bdc8bd 100644 --- a/trunk/sound/pci/ca0106/ca0106_main.c +++ b/trunk/sound/pci/ca0106/ca0106_main.c @@ -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); } diff --git a/trunk/sound/pci/ca0106/ca0106_mixer.c b/trunk/sound/pci/ca0106/ca0106_mixer.c index 97bed1b0899d..231ecac80861 100644 --- a/trunk/sound/pci/ca0106/ca0106_mixer.c +++ b/trunk/sound/pci/ca0106/ca0106_mixer.c @@ -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)))