usb: fast charge: code merge fix