diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-06-12 10:41:38 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-06-12 10:41:38 -0700 |
| commit | 85baaeb2e2d0e7c67bf4e5cc22d15e173d01b209 (patch) | |
| tree | 1c8766dde31d170fda2aa1379864cd5f544e240f | |
| parent | 5a580b891628a83847f2f71e661b05d5aed24fd0 (diff) | |
| parent | 45d1d418d6490b2c8daad5de63b8623518afc617 (diff) | |
Merge "Policy_engine: Add module parameter to disable PD"
| -rw-r--r-- | drivers/usb/pd/policy_engine.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/usb/pd/policy_engine.c b/drivers/usb/pd/policy_engine.c index 0272800269eb..03aeec2e878c 100644 --- a/drivers/usb/pd/policy_engine.c +++ b/drivers/usb/pd/policy_engine.c @@ -34,6 +34,10 @@ static bool usb_compliance_mode; module_param(usb_compliance_mode, bool, S_IRUGO|S_IWUSR); 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 { PE_UNKNOWN, PE_ERROR_RECOVERY, @@ -920,7 +924,7 @@ static void usbpd_set_state(struct usbpd *pd, enum usbpd_state next_state) break; } - if (!val.intval) + if (!val.intval || disable_usb_pd) break; pd_reset_protocol(pd); |