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
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
sound
/
core
/
oss
/
mixer_oss.c
diff --git
a/sound/core/oss/mixer_oss.c
b/sound/core/oss/mixer_oss.c
index
9c68bc3
..
f08e65a
100644
(file)
--- a/
sound/core/oss/mixer_oss.c
+++ b/
sound/core/oss/mixer_oss.c
@@
-1095,7
+1095,7
@@
static void snd_mixer_oss_proc_read(struct snd_info_entry *entry,
struct snd_mixer_oss *mixer = entry->private_data;
int i;
struct snd_mixer_oss *mixer = entry->private_data;
int i;
-
mutex_lock
(&mixer->reg_mutex);
+
down
(&mixer->reg_mutex);
for (i = 0; i < SNDRV_OSS_MAX_MIXERS; i++) {
struct slot *p;
for (i = 0; i < SNDRV_OSS_MAX_MIXERS; i++) {
struct slot *p;
@@
-1110,7
+1110,7
@@
static void snd_mixer_oss_proc_read(struct snd_info_entry *entry,
else
snd_iprintf(buffer, "\"\" 0\n");
}
else
snd_iprintf(buffer, "\"\" 0\n");
}
-
mutex_unlock
(&mixer->reg_mutex);
+
up
(&mixer->reg_mutex);
}
static void snd_mixer_oss_proc_write(struct snd_info_entry *entry,
}
static void snd_mixer_oss_proc_write(struct snd_info_entry *entry,
@@
-1134,9
+1134,9
@@
static void snd_mixer_oss_proc_write(struct snd_info_entry *entry,
cptr = snd_info_get_str(str, cptr, sizeof(str));
if (! *str) {
/* remove the entry */
cptr = snd_info_get_str(str, cptr, sizeof(str));
if (! *str) {
/* remove the entry */
-
mutex_lock
(&mixer->reg_mutex);
+
down
(&mixer->reg_mutex);
mixer_slot_clear(&mixer->slots[ch]);
mixer_slot_clear(&mixer->slots[ch]);
-
mutex_unlock
(&mixer->reg_mutex);
+
up
(&mixer->reg_mutex);
continue;
}
snd_info_get_str(idxstr, cptr, sizeof(idxstr));
continue;
}
snd_info_get_str(idxstr, cptr, sizeof(idxstr));
@@
-1145,7
+1145,7
@@
static void snd_mixer_oss_proc_write(struct snd_info_entry *entry,
snd_printk(KERN_ERR "mixer_oss: invalid index %d\n", idx);
continue;
}
snd_printk(KERN_ERR "mixer_oss: invalid index %d\n", idx);
continue;
}
-
mutex_lock
(&mixer->reg_mutex);
+
down
(&mixer->reg_mutex);
slot = (struct slot *)mixer->slots[ch].private_data;
if (slot && slot->assigned &&
slot->assigned->index == idx && ! strcmp(slot->assigned->name, str))
slot = (struct slot *)mixer->slots[ch].private_data;
if (slot && slot->assigned &&
slot->assigned->index == idx && ! strcmp(slot->assigned->name, str))
@@
-1168,7
+1168,7
@@
static void snd_mixer_oss_proc_write(struct snd_info_entry *entry,
kfree(tbl);
}
__unlock:
kfree(tbl);
}
__unlock:
-
mutex_unlock
(&mixer->reg_mutex);
+
up
(&mixer->reg_mutex);
}
}
}
}
@@
-1288,7
+1288,7
@@
static int snd_mixer_oss_notify_handler(struct snd_card *card, int cmd)
mixer = kcalloc(2, sizeof(*mixer), GFP_KERNEL);
if (mixer == NULL)
return -ENOMEM;
mixer = kcalloc(2, sizeof(*mixer), GFP_KERNEL);
if (mixer == NULL)
return -ENOMEM;
-
mutex_init
(&mixer->reg_mutex);
+
init_MUTEX
(&mixer->reg_mutex);
sprintf(name, "mixer%i%i", card->number, 0);
if ((err = snd_register_oss_device(SNDRV_OSS_DEVICE_TYPE_MIXER,
card, 0,
sprintf(name, "mixer%i%i", card->number, 0);
if ((err = snd_register_oss_device(SNDRV_OSS_DEVICE_TYPE_MIXER,
card, 0,