fix usb like a bawse =)

Conflicts:
	drivers/power/pm8921-charger-htc.c