Update of /cvsroot/alsa/alsa-kernel/pci/trident
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26232
Modified Files:
trident_main.c
Log Message:
Fixed s/pdif control initialization
Index: trident_main.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/trident/trident_main.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- trident_main.c 21 Jan 2004 18:32:48 -0000 1.52
+++ trident_main.c 22 Feb 2004 18:35:01 -0000 1.53
@@ -3052,29 +3052,49 @@
}
if (trident->device == TRIDENT_DEVICE_ID_NX || trident->device ==
TRIDENT_DEVICE_ID_SI7018) {
- if ((err = snd_ctl_add(card, kctl =
snd_ctl_new1(&snd_trident_spdif_control, trident))) < 0)
+ kctl = snd_ctl_new1(&snd_trident_spdif_control, trident);
+ if (kctl == NULL) {
+ err = -ENOMEM;
goto __out;
+ }
if (trident->ac97->ext_id & AC97_EI_SPDIF)
kctl->id.index++;
if (trident->ac97_sec && (trident->ac97_sec->ext_id & AC97_EI_SPDIF))
kctl->id.index++;
idx = kctl->id.index;
+ if ((err = snd_ctl_add(card, kctl)) < 0)
+ goto __out;
kctl->put(kctl, uctl);
- if ((err = snd_ctl_add(card, kctl =
snd_ctl_new1(&snd_trident_spdif_default, trident))) < 0)
+ kctl = snd_ctl_new1(&snd_trident_spdif_default, trident);
+ if (kctl == NULL) {
+ err = -ENOMEM;
goto __out;
+ }
kctl->id.index = idx;
kctl->id.device = pcm_spdif_device;
+ if ((err = snd_ctl_add(card, kctl)) < 0)
+ goto __out;
- if ((err = snd_ctl_add(card, kctl =
snd_ctl_new1(&snd_trident_spdif_mask, trident))) < 0)
+ kctl = snd_ctl_new1(&snd_trident_spdif_mask, trident);
+ if (kctl == NULL) {
+ err = -ENOMEM;
goto __out;
+ }
kctl->id.index = idx;
kctl->id.device = pcm_spdif_device;
+ if ((err = snd_ctl_add(card, kctl)) < 0)
+ goto __out;
- if ((err = snd_ctl_add(card, kctl =
snd_ctl_new1(&snd_trident_spdif_stream, trident))) < 0)
+ kctl = snd_ctl_new1(&snd_trident_spdif_stream, trident);
+ if (kctl == NULL) {
+ err = -ENOMEM;
goto __out;
+ }
kctl->id.index = idx;
kctl->id.device = pcm_spdif_device;
+ if ((err = snd_ctl_add(card, kctl)) < 0)
+ goto __out;
trident->spdif_pcm_ctl = kctl;
}
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
