Merge "usb: typec: Fix setting of invalid value of opmode"
This commit is contained in:
commit
2cc0c10af7
2 changed files with 3 additions and 1 deletions
|
@ -1378,7 +1378,8 @@ void typec_set_pwr_opmode(struct typec_port *port,
|
|||
{
|
||||
struct device *partner_dev;
|
||||
|
||||
if (port->pwr_opmode == opmode)
|
||||
if ((port->pwr_opmode == opmode) || (opmode < TYPEC_PWR_MODE_USB) ||
|
||||
(opmode > TYPEC_PWR_MODE_MAX))
|
||||
return;
|
||||
|
||||
port->pwr_opmode = opmode;
|
||||
|
|
|
@ -53,6 +53,7 @@ enum typec_pwr_opmode {
|
|||
TYPEC_PWR_MODE_1_5A,
|
||||
TYPEC_PWR_MODE_3_0A,
|
||||
TYPEC_PWR_MODE_PD,
|
||||
TYPEC_PWR_MODE_MAX = TYPEC_PWR_MODE_PD,
|
||||
};
|
||||
|
||||
enum typec_accessory {
|
||||
|
|
Loading…
Reference in a new issue