2002-11-28 19:49:36

by Ruslan U. Zakirov

[permalink] [raw]
Subject: [PATCH] ALSA with CONFIG_SND_SB16_CSP compiling problems in 2.5.50

Hello!

I think it's just typing error.

--- sound/isa/sb/sb16.c.orig Thu Nov 28 21:54:22 2002
+++ sound/isa/sb/sb16.c Thu Nov 28 21:55:23 2002
@@ -502,7 +502,7 @@

#ifdef CONFIG_SND_SB16_CSP
/* CSP chip on SB16ASP/AWE32 */
- if ((chip->hardware == SB_HW_16) && csp[dev]) {
+ if ((chip->hardware == SB_HW_16CSP) && csp[dev]) {
snd_sb_csp_new(chip, synth != NULL ? 1 : 0, &xcsp);
if (xcsp) {
chip->csp = xcsp->private_data;

And here is problem with CONFIG_SND_SB16_CSP turned on,
I think it must be something like this

--- sound/isa/sb/sb16.c.orig Thu Nov 28 22:28:07 2002
+++ sound/isa/sb/sb16.c Thu Nov 28 22:51:48 2002
@@ -664,7 +664,6 @@
{
static unsigned __initdata nr_dev = 0;
int __attribute__ ((__unused__)) pnp = INT_MAX;
- int __attribute__ ((__unused__)) csp = INT_MAX;

if (nr_dev >= SNDRV_CARDS)
return 0;
@@ -692,10 +691,6 @@
#ifdef __ISAPNP__
if (pnp != INT_MAX)
isapnp[nr_dev] = pnp;
-#endif
-#ifdef CONFIG_SND_SB16_CSP
- if (csp != INT_MAX)
- csp[nr_dev] = csp;
#endif
nr_dev++;
return 1;
I can mistake.
Best regards.
Ruslan