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

Merge "Policy_engine: Add module parameter to disable PD"

Browse source
This commit is contained in:
Linux Build Service Account 2017-06-12 10:41:38 -07:00 • committed by Gerrit - the friendly Code Review server
commit 85baaeb2e2
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -34,6 +34,10 @@ static bool usb_compliance_mode;
module_param(usb_compliance_mode, bool, S_IRUGO|S_IWUSR); module_param(usb_compliance_mode, bool, S_IRUGO|S_IWUSR);
MODULE_PARM_DESC(usb_compliance_mode, "Start USB stack for USB3.1 compliance testing"); MODULE_PARM_DESC(usb_compliance_mode, "Start USB stack for USB3.1 compliance testing");
static bool disable_usb_pd;
module_param(disable_usb_pd, bool, S_IRUGO|S_IWUSR);
MODULE_PARM_DESC(disable_usb_pd, "Disable USB PD for USB3.1 compliance testing");
enum usbpd_state { enum usbpd_state {
PE_UNKNOWN, PE_UNKNOWN,
PE_ERROR_RECOVERY, PE_ERROR_RECOVERY,
@ -920,7 +924,7 @@ static void usbpd_set_state(struct usbpd *pd, enum usbpd_state next_state)
break; break;
} }
if (!val.intval) if (!val.intval || disable_usb_pd)
break; break;
pd_reset_protocol(pd); pd_reset_protocol(pd);