projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
block/xen-blkback: s/nr_pages/nr_segs/
[cascardo/linux.git]
/
sound
/
oss
/
sequencer.c
diff --git
a/sound/oss/sequencer.c
b/sound/oss/sequencer.c
index
c0eea1d
..
f19da4b
100644
(file)
--- a/
sound/oss/sequencer.c
+++ b/
sound/oss/sequencer.c
@@
-681,13
+681,8
@@
static int seq_timing_event(unsigned char *event_rec)
break;
case TMR_ECHO:
break;
case TMR_ECHO:
- if (seq_mode == SEQ_2)
- seq_copy_to_input(event_rec, 8);
- else
- {
- parm = (parm << 8 | SEQ_ECHO);
- seq_copy_to_input((unsigned char *) &parm, 4);
- }
+ parm = (parm << 8 | SEQ_ECHO);
+ seq_copy_to_input((unsigned char *) &parm, 4);
break;
default:;
break;
default:;
@@
-1324,7
+1319,6
@@
int sequencer_ioctl(int dev, struct file *file, unsigned int cmd, void __user *a
int mode = translate_mode(file);
struct synth_info inf;
struct seq_event_rec event_rec;
int mode = translate_mode(file);
struct synth_info inf;
struct seq_event_rec event_rec;
- unsigned long flags;
int __user *p = arg;
orig_dev = dev = dev >> 4;
int __user *p = arg;
orig_dev = dev = dev >> 4;
@@
-1479,9
+1473,7
@@
int sequencer_ioctl(int dev, struct file *file, unsigned int cmd, void __user *a
case SNDCTL_SEQ_OUTOFBAND:
if (copy_from_user(&event_rec, arg, sizeof(event_rec)))
return -EFAULT;
case SNDCTL_SEQ_OUTOFBAND:
if (copy_from_user(&event_rec, arg, sizeof(event_rec)))
return -EFAULT;
- spin_lock_irqsave(&lock,flags);
play_event(event_rec.arr);
play_event(event_rec.arr);
- spin_unlock_irqrestore(&lock,flags);
return 0;
case SNDCTL_MIDI_INFO:
return 0;
case SNDCTL_MIDI_INFO: