Merge "power: smblib: correct PD voting when inactive"

This commit is contained in:
Linux Build Service Account 2017-09-13 10:58:09 -07:00 committed by Gerrit - the friendly Code Review server
commit b5939af1fd

View file

@ -2772,7 +2772,7 @@ int smblib_set_prop_pd_active(struct smb_charger *chg,
hvdcp = stat & QC_CHARGER_BIT; hvdcp = stat & QC_CHARGER_BIT;
vote(chg->apsd_disable_votable, PD_VOTER, false, 0); vote(chg->apsd_disable_votable, PD_VOTER, false, 0);
vote(chg->pd_allowed_votable, PD_VOTER, true, 0); vote(chg->pd_allowed_votable, PD_VOTER, true, 0);
vote(chg->usb_irq_enable_votable, PD_VOTER, true, 0); vote(chg->usb_irq_enable_votable, PD_VOTER, false, 0);
vote(chg->hvdcp_disable_votable_indirect, PD_INACTIVE_VOTER, vote(chg->hvdcp_disable_votable_indirect, PD_INACTIVE_VOTER,
false, 0); false, 0);