diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-06-26 17:19:40 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-06-26 17:19:40 -0400 |
| commit | 2a322e4c08be4e7cb0c04b427ddaaa679fd88863 (patch) | |
| tree | ad8cc17bfd3b5e57e36f07a249028667d72f0b96 /sound/oss/emu10k1/midi.c | |
| parent | ba6d2377c85c9b8a793f455d8c9b6cf31985d70f (diff) | |
| parent | 8678887e7fb43cd6c9be6c9807b05e77848e0920 (diff) | |
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'sound/oss/emu10k1/midi.c')
| -rw-r--r-- | sound/oss/emu10k1/midi.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/oss/emu10k1/midi.c b/sound/oss/emu10k1/midi.c index 33dea3d56c1e..b40b5f97aace 100644 --- a/sound/oss/emu10k1/midi.c +++ b/sound/oss/emu10k1/midi.c | |||
| @@ -523,10 +523,8 @@ void emu10k1_seq_midi_close(int dev) | |||
| 523 | card = midi_devs[dev]->devc; | 523 | card = midi_devs[dev]->devc; |
| 524 | emu10k1_mpuout_close(card); | 524 | emu10k1_mpuout_close(card); |
| 525 | 525 | ||
| 526 | if (card->seq_mididev) { | 526 | kfree(card->seq_mididev); |
| 527 | kfree(card->seq_mididev); | 527 | card->seq_mididev = NULL; |
| 528 | card->seq_mididev = NULL; | ||
| 529 | } | ||
| 530 | } | 528 | } |
| 531 | 529 | ||
| 532 | int emu10k1_seq_midi_out(int dev, unsigned char midi_byte) | 530 | int emu10k1_seq_midi_out(int dev, unsigned char midi_byte) |