diff options
| author | Takashi Iwai | 2007-09-17 16:44:06 +0200 |
|---|---|---|
| committer | Jaroslav Kysela | 2007-10-16 16:50:49 +0200 |
| commit | 1ea73412b27ddd88decbdafb83bb2bfc288fe56c (patch) | |
| tree | e0d52df51e775cddc5acf495e30af72b9be9a94a /sound | |
| parent | [ALSA] Add descriptions for new module options of snd-sscape driver (diff) | |
| download | kernel-qcow2-linux-1ea73412b27ddd88decbdafb83bb2bfc288fe56c.tar.gz kernel-qcow2-linux-1ea73412b27ddd88decbdafb83bb2bfc288fe56c.tar.xz kernel-qcow2-linux-1ea73412b27ddd88decbdafb83bb2bfc288fe56c.zip | |
[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 <rene.herman@gmail.com>
Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound')
| -rw-r--r-- | 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 049d479ce2b3..fb1d0704f2f9 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); |