msm/htc_headset_v1: Fix the last two warnings
more fixes