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
/
sequencer.c
diff --git
a/sound/oss/sequencer.c
b/sound/oss/sequencer.c
index
038bf7f
..
6815c30
100644
(file)
--- a/
sound/oss/sequencer.c
+++ b/
sound/oss/sequencer.c
@@
-28,7
+28,7
@@
static int pending_timer = -1; /* For timer change operation */
extern unsigned long seq_time;
static int obsolete_api_used;
extern unsigned long seq_time;
static int obsolete_api_used;
-static
spinlock_t lock=SPIN_LOCK_UNLOCKED
;
+static
DEFINE_SPINLOCK(lock)
;
/*
* Local counts for number of synth and MIDI devices. These are initialized
/*
* Local counts for number of synth and MIDI devices. These are initialized
@@
-709,11
+709,11
@@
static void seq_local_event(unsigned char *event_rec)
static void seq_sysex_message(unsigned char *event_rec)
{
static void seq_sysex_message(unsigned char *event_rec)
{
- int dev = event_rec[1];
+
unsigned
int dev = event_rec[1];
int i, l = 0;
unsigned char *buf = &event_rec[2];
int i, l = 0;
unsigned char *buf = &event_rec[2];
- if (
(int)
dev > max_synthdev)
+ if (dev > max_synthdev)
return;
if (!(synth_open_mask & (1 << dev)))
return;
return;
if (!(synth_open_mask & (1 << dev)))
return;
@@
-1091,7
+1091,7
@@
int sequencer_open(int dev, struct file *file)
return 0;
}
return 0;
}
-void seq_drain_midi_queues(void)
+
static
void seq_drain_midi_queues(void)
{
int i, n;
{
int i, n;
@@
-1671,14
+1671,7
@@
void sequencer_init(void)
void sequencer_unload(void)
{
void sequencer_unload(void)
{
- if(queue)
- {
- vfree(queue);
- queue=NULL;
- }
- if(iqueue)
- {
- vfree(iqueue);
- iqueue=NULL;
- }
+ vfree(queue);
+ vfree(iqueue);
+ queue = iqueue = NULL;
}
}