summaryrefslogtreecommitdiffstats
path: root/sound/pci/ali5451/ali5451.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-10-08 23:59:13 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-08 23:59:13 +0200
commit8aa19ad84c38cd50bfc0560646efe1c9ca83d925 (patch)
tree46eb8d8ea64620d989cabfe89c4f1d2dbba45b63 /sound/pci/ali5451/ali5451.c
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog (diff)
parent[ALSA] usb-audio: add MIDI quirk for Hercules DJ Console (diff)
downloadlinux-8aa19ad84c38cd50bfc0560646efe1c9ca83d925.tar.xz
linux-8aa19ad84c38cd50bfc0560646efe1c9ca83d925.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
Diffstat (limited to 'sound/pci/ali5451/ali5451.c')
-rw-r--r--sound/pci/ali5451/ali5451.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c
index d683f7736a63..f35b558c29b2 100644
--- a/sound/pci/ali5451/ali5451.c
+++ b/sound/pci/ali5451/ali5451.c
@@ -1993,8 +1993,10 @@ static int __devinit snd_ali_mixer(ali_t * codec)
if ((err = snd_ac97_mixer(codec->ac97_bus, &ac97, &codec->ac97[i])) < 0) {
snd_printk("ali mixer %d creating error.\n", i);
if(i == 0)
- return err;
- }
+ return err;
+ codec->num_of_codecs = 1;
+ break;
+ }
}
if (codec->spdif_support) {