Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bdd9ef24 authored by David Henningsson's avatar David Henningsson Committed by Takashi Iwai
Browse files

ALSA: HDA: Correctly apply position_fix quirks for ATI and VIA controllers 

Position_fix quirks for specific machines now override the default
position_fix behavior for all HDA controllers.

BugLink: http://launchpad.net/bugs/465942
BugLink: http://launchpad.net/bugs/580749
BugLink: http://launchpad.net/bugs/587546



Signed-off-by: default avatarDavid Henningsson <david.henningsson@canonical.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 6a92934d

sound/pci/hda/hda_intel.c

+9 −8
Original line number Diff line number Diff line
@@ -2315,14 +2315,6 @@ static int __devinit check_position_fix(struct azx *chip, int fix) 
		return fix;

	}



	/* Check VIA/ATI HD Audio Controller exist */

	switch (chip->driver_type) {

	case AZX_DRIVER_VIA:

	case AZX_DRIVER_ATI:

		/* Use link position directly, avoid any transfer problem. */

		return POS_FIX_VIACOMBO;

	}



	q = snd_pci_quirk_lookup(chip->pci, position_fix_list);

	if (q) {

		printk(KERN_INFO
@@ -2331,6 +2323,15 @@ static int __devinit check_position_fix(struct azx *chip, int fix) 
		       q->value, q->subvendor, q->subdevice);

		return q->value;

	}



	/* Check VIA/ATI HD Audio Controller exist */

	switch (chip->driver_type) {

	case AZX_DRIVER_VIA:

	case AZX_DRIVER_ATI:

		/* Use link position directly, avoid any transfer problem. */

		return POS_FIX_VIACOMBO;

	}



	return POS_FIX_AUTO;

}