Fix qpnp_charger.c merge