diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-12-08 11:33:24 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-12-08 11:33:24 +0100 |
commit | 77de61c3975da6f2200935c341e84018ece6ce36 (patch) | |
tree | 36508cf93ef62a80c988fa18c86eda1274e03877 /sound/pci/lola/lola_mixer.c | |
parent | ALSA: usb-audio: Don't resubmit pending URBs at MIDI error recovery (diff) | |
parent | ALSA: atmel_abdac: Add missing clock prepare (diff) | |
download | linux-77de61c3975da6f2200935c341e84018ece6ce36.tar.xz linux-77de61c3975da6f2200935c341e84018ece6ce36.zip |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/pci/lola/lola_mixer.c')
-rw-r--r-- | sound/pci/lola/lola_mixer.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/pci/lola/lola_mixer.c b/sound/pci/lola/lola_mixer.c index 782f4d8299ae..e7fe15dd5a90 100644 --- a/sound/pci/lola/lola_mixer.c +++ b/sound/pci/lola/lola_mixer.c @@ -108,8 +108,7 @@ int lola_init_pins(struct lola *chip, int dir, int *nidp) void lola_free_mixer(struct lola *chip) { - if (chip->mixer.array_saved) - vfree(chip->mixer.array_saved); + vfree(chip->mixer.array_saved); } int lola_init_mixer_widget(struct lola *chip, int nid) |