Re: trident problem

[Takashi Iwai <tiwai@suse.de>]

[-- Attachment #1: Type: text/plain, Size: 698 bytes --]

At Thu, 16 Jan 2003 10:06:14 -0800,
Alex Romosan wrote:
> 
> Takashi Iwai <tiwai@suse.de> writes:
> 
> > At 15 Jan 2003 13:01:06 -0800,
> > Alex Romosan wrote:
> >> 
> >> the latest cvs update (from a few days ago, since sourceforge seems to
> >> have problems with anonymous cvs) broke the trident driver. when i try
> >> to play a sound file i get the following:
> >> 
> >> kernel: ALSA ../../alsa-kernel/pci/trident/trident_memory.c:192: bad MAGIC (0xa55a5a5a)
> >> 
> >> any ideas?
> >
> > this must have been already fixed on the latest cvs...
> 
> i downloaded the latest cvs snapshot (2003-01-14) but the problem is
> still there.

i got it.  sorry, my typos.  the patch attached.


Takashi

[-- Attachment #2: trident-fix2.dif --]
[-- Type: application/octet-stream, Size: 1282 bytes --]

Index: alsa-kernel/pci/trident/trident_main.c
===================================================================
RCS file: /suse/tiwai/cvs/alsa/alsa-kernel/pci/trident/trident_main.c,v
retrieving revision 1.21
diff -u -r1.21 trident_main.c
--- alsa-kernel/pci/trident/trident_main.c	13 Jan 2003 09:07:53 -0000	1.21
+++ alsa-kernel/pci/trident/trident_main.c	16 Jan 2003 18:17:49 -0000
@@ -2173,7 +2173,7 @@
 	strcpy(pcm->name, "Trident 4DWave");
 	trident->pcm = pcm;
 
-	if (! trident->tlb.entries)
+	if (trident->tlb.entries)
 		snd_pcm_lib_preallocate_sg_pages_for_all(trident->pci, pcm);
 	else
 		snd_pcm_lib_preallocate_pci_pages_for_all(trident->pci, pcm, 64*1024, 128*1024);
@@ -2228,7 +2228,7 @@
 	}
 	trident->foldback = foldback;
 
-	if (! trident->tlb.entries)
+	if (trident->tlb.entries)
 		snd_pcm_lib_preallocate_sg_pages_for_all(trident->pci, foldback);
 	else
 		snd_pcm_lib_preallocate_pci_pages_for_all(trident->pci, foldback, 64*1024, 128*1024);
@@ -2272,7 +2272,7 @@
 	strcpy(spdif->name, "Trident 4DWave IEC958");
 	trident->spdif = spdif;
 
-	if (! trident->tlb.entries)
+	if (trident->tlb.entries)
 		snd_pcm_lib_preallocate_sg_pages_for_all(trident->pci, spdif);
 	else
 		snd_pcm_lib_preallocate_pci_pages_for_all(trident->pci, spdif, 64*1024, 128*1024);