diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:36:16 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-24 00:36:16 +0100 |
| commit | 9fb5430c3d6e96a74fd4406dbe7608f36abb9987 (patch) | |
| tree | 1c990d9f2f91f6daabbf2de957bea744dd2bcb71 /sound/oss/sequencer.c | |
| parent | 4c5ecb7e59662a76754efdd41c6ed4415e6e9840 (diff) | |
| parent | e5bf48437370f3fc603e2dce12e8d3fb1a6a2457 (diff) | |
Merge branch 'topic/oss-fix' into for-linus
Diffstat (limited to 'sound/oss/sequencer.c')
| -rw-r--r-- | sound/oss/sequencer.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/oss/sequencer.c b/sound/oss/sequencer.c index 5c215f787ca..c79874696be 100644 --- a/sound/oss/sequencer.c +++ b/sound/oss/sequencer.c @@ -212,7 +212,6 @@ int sequencer_write(int dev, struct file *file, const char __user *buf, int coun { unsigned char event_rec[EV_SZ], ev_code; int p = 0, c, ev_size; - int err; int mode = translate_mode(file); dev = dev >> 4; @@ -285,7 +284,7 @@ int sequencer_write(int dev, struct file *file, const char __user *buf, int coun { if (!midi_opened[event_rec[2]]) { - int mode; + int err, mode; int dev = event_rec[2]; if (dev >= max_mididev || midi_devs[dev]==NULL) |