Several sparse warnings were introduced by patches accepted during the merge
window which weren't caught.  This patch fixes those warnings.
Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>