Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=1ea73412b27ddd88decbdafb83bb2bfc288fe56c
Commit:     1ea73412b27ddd88decbdafb83bb2bfc288fe56c
Parent:     adf1295bf4edf91ed1780a43c82b352aeec1edbd
Author:     Takashi Iwai <[EMAIL PROTECTED]>
AuthorDate: Mon Sep 17 16:44:06 2007 +0200
Committer:  Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Tue Oct 16 16:50:49 2007 +0200

    [ALSA] opti9xx: adjust OPL3 FM resource value
    
    The OPTi ISA-PnP chips advertise their OPL4 base at 0x380 (to 0x3f0) through
    pnp and put their on-chip OPL3 at +8. The driver assumes the provided
    value is the ALBase (OPL3 address) though and checks for an OPL4 at -8,
    which means that simply adding 8 to the pnp provides value works to fix
    detection of both OPL3 and OPL4.
    Problem spotted on 931 and 933 by Krzysztof Helt and confirmed on 924 and
    925 (together all OPTi ISA-PnP chips) by me.
    Signed-off-by; Rene Herman <[EMAIL PROTECTED]>
    Acked-by: Krzysztof Helt <[EMAIL PROTECTED]>
    
    Signed-off-by: Takashi Iwai <[EMAIL PROTECTED]>
    Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
 sound/isa/opti9xx/opti92x-ad1848.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/isa/opti9xx/opti92x-ad1848.c 
b/sound/isa/opti9xx/opti92x-ad1848.c
index 049d479..fb1d070 100644
--- a/sound/isa/opti9xx/opti92x-ad1848.c
+++ b/sound/isa/opti9xx/opti92x-ad1848.c
@@ -1732,11 +1732,11 @@ static int __devinit snd_card_opti9xx_pnp(struct 
snd_opti9xx *chip,
 
 #ifdef OPTi93X
        port = pnp_port_start(pdev, 0) - 4;
-       fm_port = pnp_port_start(pdev, 1);
+       fm_port = pnp_port_start(pdev, 1) + 8;
 #else
        if (pid->driver_data != 0x0924)
                port = pnp_port_start(pdev, 1);
-       fm_port = pnp_port_start(pdev, 2);
+       fm_port = pnp_port_start(pdev, 2) + 8;
 #endif /* OPTi93X */
        irq = pnp_irq(pdev, 0);
        dma1 = pnp_dma(pdev, 0);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to