diff options
author | Krzysztof Helt <krzysztof.h1@wp.pl> | 2009-01-21 09:08:03 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-01-21 09:11:02 -0500 |
commit | aa9c293ae46d71f5add0761bce8db67b162e3f29 (patch) | |
tree | 2959f67371e81c448be89fd11bdeb3310b99158f /sound/isa/opti9xx | |
parent | 48972cc5101dee24243c1b53d409cc27880e7a29 (diff) |
ALSA: do not create OPL3 timers if there is no OPL3 irq wired
Most cards have OPL3 FM synthetiser but
they do not have OPL3 interrupt wired to
a sound chip or CPU.
Do not create OPL3 timers for such cards
as the timers are useless witthout interrupt.
This patch removes OPL3 timers for following
alsa drivers: snd-ad1816a, snd-opti93x,
snd-opti92x, snd-sc6000, snd-cmi8330.
Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/isa/opti9xx')
-rw-r--r-- | sound/isa/opti9xx/opti92x-ad1848.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sound/isa/opti9xx/opti92x-ad1848.c b/sound/isa/opti9xx/opti92x-ad1848.c index 19706b0d8497..5deb7e69a029 100644 --- a/sound/isa/opti9xx/opti92x-ad1848.c +++ b/sound/isa/opti9xx/opti92x-ad1848.c | |||
@@ -815,14 +815,8 @@ static int __devinit snd_opti9xx_probe(struct snd_card *card) | |||
815 | chip->fm_port, chip->fm_port + 4 - 1); | 815 | chip->fm_port, chip->fm_port + 4 - 1); |
816 | } | 816 | } |
817 | if (opl3) { | 817 | if (opl3) { |
818 | #ifdef CS4231 | 818 | error = snd_opl3_hwdep_new(opl3, 0, 1, &synth); |
819 | const int t1dev = 1; | 819 | if (error < 0) |
820 | #else | ||
821 | const int t1dev = 0; | ||
822 | #endif | ||
823 | if ((error = snd_opl3_timer_new(opl3, t1dev, t1dev+1)) < 0) | ||
824 | return error; | ||
825 | if ((error = snd_opl3_hwdep_new(opl3, 0, 1, &synth)) < 0) | ||
826 | return error; | 820 | return error; |
827 | } | 821 | } |
828 | } | 822 | } |