diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-12-08 10:33:24 (GMT) |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-12-08 10:33:24 (GMT) |
| commit | 77de61c3975da6f2200935c341e84018ece6ce36 (patch) | |
| tree | 36508cf93ef62a80c988fa18c86eda1274e03877 /sound/isa/sb/emu8000_synth.c | |
| parent | 66139a48cee1530c91f37c145384b4ee7043f0b7 (diff) | |
| parent | 048184540171672a724ab8f8bada7fcc0762f5c6 (diff) | |
| download | linux-77de61c3975da6f2200935c341e84018ece6ce36.tar.xz | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/isa/sb/emu8000_synth.c')
| -rw-r--r-- | sound/isa/sb/emu8000_synth.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/isa/sb/emu8000_synth.c b/sound/isa/sb/emu8000_synth.c index 4e3fcfb..95b39be 100644 --- a/sound/isa/sb/emu8000_synth.c +++ b/sound/isa/sb/emu8000_synth.c @@ -105,8 +105,7 @@ static int snd_emu8000_delete_device(struct snd_seq_device *dev) snd_device_free(dev->card, hw->pcm); if (hw->emu) snd_emux_free(hw->emu); - if (hw->memhdr) - snd_util_memhdr_free(hw->memhdr); + snd_util_memhdr_free(hw->memhdr); hw->emu = NULL; hw->memhdr = NULL; return 0; |