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
/
drivers
/
opl3
/
opl3_synth.c
diff --git
a/sound/drivers/opl3/opl3_synth.c
b/sound/drivers/opl3/opl3_synth.c
index
3534a0e
..
a4b3543
100644
(file)
--- a/
sound/drivers/opl3/opl3_synth.c
+++ b/
sound/drivers/opl3/opl3_synth.c
@@
-58,6
+58,8
@@
char snd_opl3_regmap[MAX_OPL2_VOICES][4] =
{ 0x12, 0x15, 0x00, 0x00 } /* is selected (only left reg block) */
};
{ 0x12, 0x15, 0x00, 0x00 } /* is selected (only left reg block) */
};
+EXPORT_SYMBOL(snd_opl3_regmap);
+
/*
* prototypes
*/
/*
* prototypes
*/
@@
-76,13
+78,13
@@
int snd_opl3_open(struct snd_hwdep * hw, struct file *file)
{
struct snd_opl3 *opl3 = hw->private_data;
{
struct snd_opl3 *opl3 = hw->private_data;
-
down
(&opl3->access_mutex);
+
mutex_lock
(&opl3->access_mutex);
if (opl3->used) {
if (opl3->used) {
-
up
(&opl3->access_mutex);
+
mutex_unlock
(&opl3->access_mutex);
return -EAGAIN;
}
opl3->used++;
return -EAGAIN;
}
opl3->used++;
-
up
(&opl3->access_mutex);
+
mutex_unlock
(&opl3->access_mutex);
return 0;
}
return 0;
}
@@
-179,9
+181,9
@@
int snd_opl3_release(struct snd_hwdep * hw, struct file *file)
struct snd_opl3 *opl3 = hw->private_data;
snd_opl3_reset(opl3);
struct snd_opl3 *opl3 = hw->private_data;
snd_opl3_reset(opl3);
-
down
(&opl3->access_mutex);
+
mutex_lock
(&opl3->access_mutex);
opl3->used--;
opl3->used--;
-
up
(&opl3->access_mutex);
+
mutex_unlock
(&opl3->access_mutex);
return 0;
}
return 0;
}
@@
-228,6
+230,7
@@
void snd_opl3_reset(struct snd_opl3 * opl3)
opl3->rhythm = 0;
}
opl3->rhythm = 0;
}
+EXPORT_SYMBOL(snd_opl3_reset);
static int snd_opl3_play_note(struct snd_opl3 * opl3, struct snd_dm_fm_note * note)
{
static int snd_opl3_play_note(struct snd_opl3 * opl3, struct snd_dm_fm_note * note)
{
@@
-445,3
+448,4
@@
static int snd_opl3_set_connection(struct snd_opl3 * opl3, int connection)
return 0;
}
return 0;
}
+