htc-battery:Fix previous merge issues
Weird having these unmerged..

Signed-off-by: zeroblade1984 <zeroblade1984@gmail.com>