evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "PD: policy_engine: Add timeout for mode change through sysfs"

Browse source
This commit is contained in:
Linux Build Service Account 2017-06-09 02:45:17 -07:00 • committed by Gerrit - the friendly Code Review server
commit 8bb96fd0d3
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/usb/pd/policy_engine.c
View file

@ -2552,6 +2552,7 @@ static int usbpd_dr_set_property(struct dual_role_phy_instance *dual_role,
{ {
struct usbpd *pd = dual_role_get_drvdata(dual_role); struct usbpd *pd = dual_role_get_drvdata(dual_role);
bool do_swap = false; bool do_swap = false;
int wait_count = 5;
if (!pd) if (!pd)
return -ENODEV; return -ENODEV;
@ -2578,9 +2579,15 @@ static int usbpd_dr_set_property(struct dual_role_phy_instance *dual_role,
set_power_role(pd, PR_NONE); set_power_role(pd, PR_NONE);
/* wait until it takes effect */ /* wait until it takes effect */
while (pd->forced_pr != POWER_SUPPLY_TYPEC_PR_NONE) while (pd->forced_pr != POWER_SUPPLY_TYPEC_PR_NONE &&
--wait_count)
msleep(20); msleep(20);
if (!wait_count) {
usbpd_err(&pd->dev, "setting mode timed out\n");
return -ETIMEDOUT;
}
break; break;
case DUAL_ROLE_PROP_DR: case DUAL_ROLE_PROP_DR: