Marginally less code and eliminate the possibility of memory leaks.
Signed-off-by: NGuenter Roeck <linux@roeck-us.net>