diff options
author | Krzysztof Helt <krzysztof.h1@wp.pl> | 2008-06-08 01:57:53 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@perex.cz> | 2008-06-13 10:29:25 -0400 |
commit | 3ae5f36a368b143cfd8a6f7a988a012c1b46eda0 (patch) | |
tree | 77fc60771e0043f0014588f056522f3b87d5de0d /sound | |
parent | 38f582270feb19ea8821cb64c5d2fdbd6bdd0bd9 (diff) |
[ALSA] opti93x: fix sound ouput for Opti930
This patch fixes silenced output from the Opti930.
Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Acked-by: Rene Herman <rene.herman@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/isa/opti9xx/opti92x-ad1848.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c index fe1afc13a01d..fc15b88364b4 100644 --- a/sound/isa/opti9xx/opti92x-ad1848.c +++ b/sound/isa/opti9xx/opti92x-ad1848.c | |||
@@ -491,16 +491,9 @@ static int __devinit snd_opti9xx_configure(struct snd_opti9xx *chip) | |||
491 | break; | 491 | break; |
492 | 492 | ||
493 | #else /* OPTi93X */ | 493 | #else /* OPTi93X */ |
494 | case OPTi9XX_HW_82C930: | ||
495 | case OPTi9XX_HW_82C931: | 494 | case OPTi9XX_HW_82C931: |
496 | case OPTi9XX_HW_82C933: | 495 | case OPTi9XX_HW_82C933: |
497 | snd_opti9xx_write_mask(chip, OPTi9XX_MC_REG(6), 0x02, 0x03); | 496 | /* |
498 | snd_opti9xx_write_mask(chip, OPTi9XX_MC_REG(3), 0x00, 0xff); | ||
499 | snd_opti9xx_write_mask(chip, OPTi9XX_MC_REG(4), 0x10 | | ||
500 | (chip->hardware == OPTi9XX_HW_82C930 ? 0x00 : 0x04), | ||
501 | 0x34); | ||
502 | snd_opti9xx_write_mask(chip, OPTi9XX_MC_REG(5), 0x20, 0xbf); | ||
503 | /* | ||
504 | * The BTC 1817DW has QS1000 wavetable which is connected | 497 | * The BTC 1817DW has QS1000 wavetable which is connected |
505 | * to the serial digital input of the OPTI931. | 498 | * to the serial digital input of the OPTI931. |
506 | */ | 499 | */ |
@@ -510,6 +503,13 @@ static int __devinit snd_opti9xx_configure(struct snd_opti9xx *chip) | |||
510 | * or digital input signal. | 503 | * or digital input signal. |
511 | */ | 504 | */ |
512 | snd_opti9xx_write_mask(chip, OPTi9XX_MC_REG(26), 0x01, 0x01); | 505 | snd_opti9xx_write_mask(chip, OPTi9XX_MC_REG(26), 0x01, 0x01); |
506 | case OPTi9XX_HW_82C930: /* FALL THROUGH */ | ||
507 | snd_opti9xx_write_mask(chip, OPTi9XX_MC_REG(6), 0x02, 0x03); | ||
508 | snd_opti9xx_write_mask(chip, OPTi9XX_MC_REG(3), 0x00, 0xff); | ||
509 | snd_opti9xx_write_mask(chip, OPTi9XX_MC_REG(4), 0x10 | | ||
510 | (chip->hardware == OPTi9XX_HW_82C930 ? 0x00 : 0x04), | ||
511 | 0x34); | ||
512 | snd_opti9xx_write_mask(chip, OPTi9XX_MC_REG(5), 0x20, 0xbf); | ||
513 | break; | 513 | break; |
514 | #endif /* OPTi93X */ | 514 | #endif /* OPTi93X */ |
515 | 515 | ||