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
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
sound
/
oss
/
sb_mixer.c
diff --git
a/sound/oss/sb_mixer.c
b/sound/oss/sb_mixer.c
index
f56898c
..
fad1a4f
100644
(file)
--- a/
sound/oss/sb_mixer.c
+++ b/
sound/oss/sb_mixer.c
@@
-1,5
+1,5
@@
/*
/*
- * sound/sb_mixer.c
+ * sound/
oss/
sb_mixer.c
*
* The low level mixer driver for the Sound Blaster compatible cards.
*/
*
* The low level mixer driver for the Sound Blaster compatible cards.
*/
@@
-273,14
+273,14
@@
int sb_common_mixer_set(sb_devc * devc, int dev, int left, int right)
int regoffs;
unsigned char val;
int regoffs;
unsigned char val;
+ if ((dev < 0) || (dev >= devc->iomap_sz))
+ return -EINVAL;
+
regoffs = (*devc->iomap)[dev][LEFT_CHN].regno;
if (regoffs == 0)
return -EINVAL;
regoffs = (*devc->iomap)[dev][LEFT_CHN].regno;
if (regoffs == 0)
return -EINVAL;
- if ((dev < 0) || (dev >= devc->iomap_sz))
- return -EINVAL;
-
val = sb_getmixer(devc, regoffs);
change_bits(devc, &val, dev, LEFT_CHN, left);
val = sb_getmixer(devc, regoffs);
change_bits(devc, &val, dev, LEFT_CHN, left);
@@
-734,7
+734,7
@@
int sb_mixer_init(sb_devc * devc, struct module *owner)
if (m == -1)
return 0;
if (m == -1)
return 0;
- mixer_devs[m] =
(struct mixer_operations *)
kmalloc(sizeof(struct mixer_operations), GFP_KERNEL);
+ mixer_devs[m] = kmalloc(sizeof(struct mixer_operations), GFP_KERNEL);
if (mixer_devs[m] == NULL)
{
printk(KERN_ERR "sb_mixer: Can't allocate memory\n");
if (mixer_devs[m] == NULL)
{
printk(KERN_ERR "sb_mixer: Can't allocate memory\n");