From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rene Herman Subject: [PATCH] ALSA: wss_lib: opti92x-ad1848 WSS_HW_DETECT fix Date: Mon, 04 Aug 2008 05:34:47 +0200 Message-ID: <489678D7.8030104@keyaccess.nl> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------040800040305000006090808" Return-path: Received: from smtpq1.tilbu1.nb.home.nl (smtpq1.tilbu1.nb.home.nl [213.51.146.200]) by alsa0.perex.cz (Postfix) with ESMTP id E8DCE243DF for ; Mon, 4 Aug 2008 05:34:49 +0200 (CEST) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: alsa-devel-bounces@alsa-project.org Errors-To: alsa-devel-bounces@alsa-project.org To: Takashi Iwai Cc: ALSA devel , Krzysztof Helt List-Id: alsa-devel@alsa-project.org This is a multi-part message in MIME format. --------------040800040305000006090808 Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit I wrote: > Firstly, snd-opti92x-ad1848 doesn't work for anything anymore. The > chip is each time detected as "OPTi 93x" instead of the actual AD/CS > chip. Probably minor buglet -- I did not look, just mechanically > switched cards and tested. The attached seems to fix things. Rene. --------------040800040305000006090808 Content-Type: text/plain; name="0001-ALSA-wss_lib-opti92x-ad1848-WSS_HW_DETECT-fix.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename*0="0001-ALSA-wss_lib-opti92x-ad1848-WSS_HW_DETECT-fix.patch" >>From 3e75fdd69c577bf29ee5a6583d479646a12c9d52 Mon Sep 17 00:00:00 2001 From: Rene Herman Date: Mon, 4 Aug 2008 05:26:26 +0200 Subject: [PATCH] ALSA: wss_lib: opti92x-ad1848 WSS_HW_DETECT fix snd-opti92x-ad1848 mistakingly passes WSS_HW_OPTI93X currently. This fixes it as tested with a OPTi 82C929A/AD1848 card. Signed-off-by: Rene Herman --- sound/isa/opti9xx/opti92x-ad1848.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c index cb5f66b..19706b0 100644 --- a/sound/isa/opti9xx/opti92x-ad1848.c +++ b/sound/isa/opti9xx/opti92x-ad1848.c @@ -719,6 +719,8 @@ static int __devinit snd_opti9xx_probe(struct snd_card *card) chip->dma1 = dma1; #if defined(CS4231) || defined(OPTi93X) chip->dma2 = dma2; +#else + chip->dma2 = -1; #endif if (chip->wss_base == SNDRV_AUTO_PORT) { @@ -734,10 +736,10 @@ static int __devinit snd_opti9xx_probe(struct snd_card *card) error = snd_wss_create(card, chip->wss_base + 4, -1, chip->irq, chip->dma1, chip->dma2, -#ifdef CS4231 - WSS_HW_DETECT, 0, -#else /* OPTi93x */ +#ifdef OPTi93X WSS_HW_OPTI93X, WSS_HWSHARE_IRQ, +#else + WSS_HW_DETECT, 0, #endif &codec); if (error < 0) -- 1.5.5 --------------040800040305000006090808 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel --------------040800040305000006090808--