Re: Problems with multiple simultaneous ac97 quirks

[Matthew Garrett <mjg59@srcf.ucam.org>]

[-- Attachment #1: Type: text/plain, Size: 494 bytes --]

On Thu, Sep 15, 2005 at 09:49:41PM +0200, Takashi Iwai wrote:

> I think the new quirk is the only solution in this case.
> And there won't be so many combinations in the real world, I'd
> expect.

Ok. Something like the following patch? It introduces 
AC97_TUNE_HP_MUTE_LED (yes, it's a poor name...) which is identical to 
AC97_TUNE_MUTE_LED except it calls bind_hp_volsw_put instead of 
snd_ac97_put_volsw and removes the headphone mixer controls.

-- 
Matthew Garrett | mjg59@srcf.ucam.org

[-- Attachment #2: ac97.diff --]
[-- Type: text/plain, Size: 599 bytes --]

--- sound/pci/ac97/ac97_codec.c.orig	2005-09-13 15:45:35.000000000 +0100
+++ linux/sound/pci/ac97/ac97_codec.c	2005-09-13 15:46:05.000000000 +0100
@@ -2551,9 +2551,10 @@ int snd_ac97_tune_hardware(ac97_t *ac97,
 				continue;
 			snd_printdd("ac97 quirk for %s (%04x:%04x)\n", quirk->name, ac97->subsystem_vendor, ac97->subsystem_device);
 			result = apply_quirk(ac97, quirk->type);
-			if (result < 0)
+			if (result < 0) {
 				snd_printk(KERN_ERR "applying quirk type %d for %s failed (%d)\n", quirk->type, quirk->name, result);
-			return result;
+				return result;
+			}
 		}
 	}
 	return 0;