Clean up the previous commit for fixing memory leaks.
Signed-off-by: NTakashi Iwai <tiwai@suse.de>