aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorAlexander Viro <viro@www.linux.org.uk>2004-07-26 06:59:03 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-07-26 06:59:03 -0700
commit2b7b3e43b4104f1241bcaafe51b98b3691986482 (patch)
tree01e412f1ff7cc01d4224863b87aa0f35d59d8a55 /sound
parent487db1c700f6977adabf51c98f99bd9efd6e0c9b (diff)
downloadhistory-2b7b3e43b4104f1241bcaafe51b98b3691986482.tar.gz
[PATCH] misc sound/* fixes
a) ALSA variant of wavefront didn't compile on gcc 2.x with debugging turned on - authors heard something about variadic macros on gcc 2.x, but screwed it up. Fixed. b) au88x0 relied on char being signed in non-trivial ways. On ppc it's not true. Fixed by explicit use of s8 (which is what that code really wants). Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/isa/wavefront/wavefront_synth.c2
-rw-r--r--sound/pci/au88x0/au88x0.h10
2 files changed, 6 insertions, 6 deletions
diff --git a/sound/isa/wavefront/wavefront_synth.c b/sound/isa/wavefront/wavefront_synth.c
index 814edffd295c42..b4fab43e4ec1b2 100644
--- a/sound/isa/wavefront/wavefront_synth.c
+++ b/sound/isa/wavefront/wavefront_synth.c
@@ -123,7 +123,7 @@ MODULE_PARM_DESC(osrun_time, "how many seconds to wait for the ICS2115 OS");
#else
#define DPRINT(cond, args...) \
if ((dev->debug & (cond)) == (cond)) { \
- snd_printk (##args); \
+ snd_printk (args); \
}
#endif
#else
diff --git a/sound/pci/au88x0/au88x0.h b/sound/pci/au88x0/au88x0.h
index 815de180c7a3b8..bf6097d04de444 100644
--- a/sound/pci/au88x0/au88x0.h
+++ b/sound/pci/au88x0/au88x0.h
@@ -146,12 +146,12 @@ struct snd_vortex {
#endif
/* Global resources */
- char mixcapt[2];
- char mixplayb[4];
+ s8 mixcapt[2];
+ s8 mixplayb[4];
#ifndef CHIP_AU8820
- char mixspdif[2];
- char mixa3d[2]; /* mixers which collect all a3d streams. */
- char mixxtlk[2]; /* crosstalk canceler mixer inputs. */
+ s8 mixspdif[2];
+ s8 mixa3d[2]; /* mixers which collect all a3d streams. */
+ s8 mixxtlk[2]; /* crosstalk canceler mixer inputs. */
#endif
u32 fixed_res[5];