From 2f1781aa0225c10f6f446a5ebe32366f8d7a40a1 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 30 Sep 2003 16:31:29 +0200 Subject: [PATCH] ALSA CVS update D:2003/09/30 11:12:09 C:VIA82xx driver A:Takashi Iwai F:pci/via82xx.c:1.52->1.53 L:- fixed the detection of VIA8233A (it was overridden by dxs_support L: option). --- sound/pci/via82xx.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c index 13f4ee0a68b8f..0d35c40fc56bd 100644 --- a/sound/pci/via82xx.c +++ b/sound/pci/via82xx.c @@ -2038,16 +2038,17 @@ static int __devinit snd_via82xx_probe(struct pci_dev *pci, break; } } - if (dxs_support[dev] == VIA_DXS_AUTO) - dxs_support[dev] = check_dxs_list(pci); - /* force to use VIA8233 or 8233A model according to - * dxs_support module option - */ - if (dxs_support[dev] == VIA_DXS_DISABLE) - chip_type = TYPE_VIA8233A; - else - chip_type = TYPE_VIA8233; - + if (chip_type != TYPE_VIA8233A) { + if (dxs_support[dev] == VIA_DXS_AUTO) + dxs_support[dev] = check_dxs_list(pci); + /* force to use VIA8233 or 8233A model according to + * dxs_support module option + */ + if (dxs_support[dev] == VIA_DXS_DISABLE) + chip_type = TYPE_VIA8233A; + else + chip_type = TYPE_VIA8233; + } if (chip_type == TYPE_VIA8233A) strcpy(card->driver, "VIA8233A"); else -- 2.53.0