summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2019-01-22 23:51:10 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2019-01-22 23:51:09 -0800
commit1e1f5e57c594ca374ba703a2616c6ee556a5e489 (patch)
tree0394cd18f53ad7ab0dbade23e617a67ac8e17e30
parent1e87dfb19c9083982e288079ec34fe7076eac8db (diff)
parentc4085b6ce2a05d3f47b10e49520396800621c1bb (diff)
Merge "usb: pd: Don't reject sink request based on max current"
-rw-r--r--drivers/usb/pd/policy_engine.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/usb/pd/policy_engine.c b/drivers/usb/pd/policy_engine.c
index a2cb7147a8ee..540498548978 100644
--- a/drivers/usb/pd/policy_engine.c
+++ b/drivers/usb/pd/policy_engine.c
@@ -1113,8 +1113,6 @@ static void usbpd_set_state(struct usbpd *pd, enum usbpd_state next_state)
case PE_SRC_NEGOTIATE_CAPABILITY:
if (PD_RDO_OBJ_POS(pd->rdo) != 1 ||
PD_RDO_FIXED_CURR(pd->rdo) >
- PD_SRC_PDO_FIXED_MAX_CURR(*default_src_caps) ||
- PD_RDO_FIXED_CURR_MINMAX(pd->rdo) >
PD_SRC_PDO_FIXED_MAX_CURR(*default_src_caps)) {
/* send Reject */
ret = pd_send_msg(pd, MSG_REJECT, NULL, 0, SOP_MSG);