git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
sound
/
oss
/
awe_wave.c
diff --git
a/sound/oss/awe_wave.c
b/sound/oss/awe_wave.c
index
f49a2de
..
d1a0eb2
100644
(file)
--- a/
sound/oss/awe_wave.c
+++ b/
sound/oss/awe_wave.c
@@
-207,8
+207,8
@@
static awe_chan_info channels[AWE_MAX_CHANNELS];
#define AWE_DEFAULT_MEM_SIZE -1 /* autodetect */
#endif
#define AWE_DEFAULT_MEM_SIZE -1 /* autodetect */
#endif
-int io = AWE_DEFAULT_BASE_ADDR; /* Emu8000 base address */
-int memsize = AWE_DEFAULT_MEM_SIZE; /* memory size in Kbytes */
+
static
int io = AWE_DEFAULT_BASE_ADDR; /* Emu8000 base address */
+
static
int memsize = AWE_DEFAULT_MEM_SIZE; /* memory size in Kbytes */
#ifdef CONFIG_PNP
static int isapnp = -1;
#else
#ifdef CONFIG_PNP
static int isapnp = -1;
#else
@@
-219,11
+219,11
@@
MODULE_AUTHOR("Takashi Iwai <iwai@ww.uni-erlangen.de>");
MODULE_DESCRIPTION("SB AWE32/64 WaveTable driver");
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("SB AWE32/64 WaveTable driver");
MODULE_LICENSE("GPL");
-
MODULE_PARM(io, "i"
);
+
module_param(io, int, 0
);
MODULE_PARM_DESC(io, "base i/o port of Emu8000");
MODULE_PARM_DESC(io, "base i/o port of Emu8000");
-
MODULE_PARM(memsize, "i"
);
+
module_param(memsize, int, 0
);
MODULE_PARM_DESC(memsize, "onboard DRAM size in Kbytes");
MODULE_PARM_DESC(memsize, "onboard DRAM size in Kbytes");
-
MODULE_PARM(isapnp, "i"
);
+
module_param(isapnp, bool, 0
);
MODULE_PARM_DESC(isapnp, "use ISAPnP detection");
/* DRAM start offset */
MODULE_PARM_DESC(isapnp, "use ISAPnP detection");
/* DRAM start offset */
@@
-2944,7
+2944,7
@@
alloc_new_info(void)
{
awe_voice_list *newlist;
{
awe_voice_list *newlist;
- newlist =
(awe_voice_list *)
kmalloc(sizeof(*newlist), GFP_KERNEL);
+ newlist = kmalloc(sizeof(*newlist), GFP_KERNEL);
if (newlist == NULL) {
printk(KERN_ERR "AWE32: can't alloc info table\n");
return NULL;
if (newlist == NULL) {
printk(KERN_ERR "AWE32: can't alloc info table\n");
return NULL;
@@
-3547,8
+3547,10
@@
awe_load_guspatch(const char __user *addr, int offs, int size, int pmgr_flag)
smp->checksum_flag = 0;
smp->checksum = 0;
smp->checksum_flag = 0;
smp->checksum = 0;
- if ((rc = awe_write_wave_data(addr, sizeof_patch, smprec, -1)) < 0)
+ if ((rc = awe_write_wave_data(addr, sizeof_patch, smprec, -1)) < 0) {
+ kfree(vrec);
return rc;
return rc;
+ }
sf->mem_ptr += rc;
add_sf_sample(sf, smprec);
sf->mem_ptr += rc;
add_sf_sample(sf, smprec);
@@
-4130,7
+4132,7
@@
static void __init attach_mixer(void)
}
}
}
}
-static void
__exit
unload_mixer(void)
+static void unload_mixer(void)
{
if (my_mixerdev >= 0)
sound_unload_mixerdev(my_mixerdev);
{
if (my_mixerdev >= 0)
sound_unload_mixerdev(my_mixerdev);
@@
-4968,7
+4970,7
@@
static void __init attach_midiemu(void)
midi_devs[my_mididev] = &awe_midi_operations;
}
midi_devs[my_mididev] = &awe_midi_operations;
}
-static void
__exit
unload_midiemu(void)
+static void unload_midiemu(void)
{
if (my_mididev >= 0)
sound_unload_mididev(my_mididev);
{
if (my_mididev >= 0)
sound_unload_mididev(my_mididev);
@@
-6062,7
+6064,7
@@
static int awe_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id
io1 = pnp_port_start(dev,0);
io2 = pnp_port_start(dev,1);
io3 = pnp_port_start(dev,2);
io1 = pnp_port_start(dev,0);
io2 = pnp_port_start(dev,1);
io3 = pnp_port_start(dev,2);
- printk(KERN_INFO "AWE32: A PnP Wave Table was detected at IO's %#x,%#x,%#x
\n.
",
+ printk(KERN_INFO "AWE32: A PnP Wave Table was detected at IO's %#x,%#x,%#x
.\n
",
io1, io2, io3);
setup_ports(io1, io2, io3);
io1, io2, io3);
setup_ports(io1, io2, io3);
@@
-6113,12
+6115,12
@@
awe_detect(void)
return 0;
}
return 0;
}
-int __init attach_awe(void)
+
static
int __init attach_awe(void)
{
return awe_detect() ? 0 : -ENODEV;
}
{
return awe_detect() ? 0 : -ENODEV;
}
-void __exit unload_awe(void)
+
static
void __exit unload_awe(void)
{
pnp_unregister_driver(&awe_pnp_driver);
awe_dettach_device();
{
pnp_unregister_driver(&awe_pnp_driver);
awe_dettach_device();