Lost Master control on MSI 645?

Lost Master control on MSI 645?

[Arthur Crosby Smith]

I found that I lost the Master control on my mixer (alsamixer) with 2.6.3. I see
that an ac97_quirk (linux/sound/pci/intel8x0.c) had been added for an "MSI P4 ATX
645 Ultra" motherboard. I have an MSI 645E Max-U (MS-6547) (v2.1) Motherboard and
it seems to trigger this. The quirk tries to move the headphone output control to
the master control. Unfortunately, my motherboard doesn't have a headphone control
so this just removes my Master control. This patch checks to see if the headphone
control exists before removing the master control. With this patch, my Master
control shows up again...
  Art


--- orig/sound/pci/ac97/ac97_codec.c    2004-02-19 13:32:28.000000000 -0600
+++ linux/sound/pci/ac97/ac97_codec.c   2004-02-19 13:19:25.000000000 -0600
@@ -2112,6 +2112,7 @@ static int swap_headphone(ac97_t *ac97,
 {
        /* FIXME: error checks.. */
        if (remove_master) {
+               if (ctl_find(ac97,"Headphone Playback Switch") == NULL) return 0;
                snd_ac97_remove_ctl(ac97, "Master Playback Switch");
                snd_ac97_remove_ctl(ac97, "Master Playback Volume");
        } else {