diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-10-25 03:56:32 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-10-25 03:56:32 -0400 |
| commit | 79fc84c7e0d2fe89c4e82f3a26fd8b0d13c31703 (patch) | |
| tree | e32a4c267dc1b5950012e18c1e71d8057140f1f5 /sound/pci/emu10k1/emumpu401.c | |
| parent | f6f94e2ab1b33f0082ac22d71f66385a60d8157f (diff) | |
| parent | 97c44b2dbd0060e2e6bd56236eb638ab02ec7f30 (diff) | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/pci/emu10k1/emumpu401.c')
| -rw-r--r-- | sound/pci/emu10k1/emumpu401.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/emu10k1/emumpu401.c b/sound/pci/emu10k1/emumpu401.c index 8578c70c61f2..bab564824efe 100644 --- a/sound/pci/emu10k1/emumpu401.c +++ b/sound/pci/emu10k1/emumpu401.c | |||
| @@ -321,7 +321,7 @@ static struct snd_rawmidi_ops snd_emu10k1_midi_input = | |||
| 321 | 321 | ||
| 322 | static void snd_emu10k1_midi_free(struct snd_rawmidi *rmidi) | 322 | static void snd_emu10k1_midi_free(struct snd_rawmidi *rmidi) |
| 323 | { | 323 | { |
| 324 | struct snd_emu10k1_midi *midi = (struct snd_emu10k1_midi *)rmidi->private_data; | 324 | struct snd_emu10k1_midi *midi = rmidi->private_data; |
| 325 | midi->interrupt = NULL; | 325 | midi->interrupt = NULL; |
| 326 | midi->rmidi = NULL; | 326 | midi->rmidi = NULL; |
| 327 | } | 327 | } |