aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
Diffstat (limited to 'sound')
-rw-r--r--sound/oss/sequencer.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/sound/oss/sequencer.c b/sound/oss/sequencer.c
index c0eea1dfe90f..f19da4b47c1d 100644
--- a/sound/oss/sequencer.c
+++ b/sound/oss/sequencer.c
@@ -681,13 +681,8 @@ static int seq_timing_event(unsigned char *event_rec)
681 break; 681 break;
682 682
683 case TMR_ECHO: 683 case TMR_ECHO:
684 if (seq_mode == SEQ_2) 684 parm = (parm << 8 | SEQ_ECHO);
685 seq_copy_to_input(event_rec, 8); 685 seq_copy_to_input((unsigned char *) &parm, 4);
686 else
687 {
688 parm = (parm << 8 | SEQ_ECHO);
689 seq_copy_to_input((unsigned char *) &parm, 4);
690 }
691 break; 686 break;
692 687
693 default:; 688 default:;
@@ -1324,7 +1319,6 @@ int sequencer_ioctl(int dev, struct file *file, unsigned int cmd, void __user *a
1324 int mode = translate_mode(file); 1319 int mode = translate_mode(file);
1325 struct synth_info inf; 1320 struct synth_info inf;
1326 struct seq_event_rec event_rec; 1321 struct seq_event_rec event_rec;
1327 unsigned long flags;
1328 int __user *p = arg; 1322 int __user *p = arg;
1329 1323
1330 orig_dev = dev = dev >> 4; 1324 orig_dev = dev = dev >> 4;
@@ -1479,9 +1473,7 @@ int sequencer_ioctl(int dev, struct file *file, unsigned int cmd, void __user *a
1479 case SNDCTL_SEQ_OUTOFBAND: 1473 case SNDCTL_SEQ_OUTOFBAND:
1480 if (copy_from_user(&event_rec, arg, sizeof(event_rec))) 1474 if (copy_from_user(&event_rec, arg, sizeof(event_rec)))
1481 return -EFAULT; 1475 return -EFAULT;
1482 spin_lock_irqsave(&lock,flags);
1483 play_event(event_rec.arr); 1476 play_event(event_rec.arr);
1484 spin_unlock_irqrestore(&lock,flags);
1485 return 0; 1477 return 0;
1486 1478
1487 case SNDCTL_MIDI_INFO: 1479 case SNDCTL_MIDI_INFO: