Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2e2c008 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "usb: typec: Fix setting of invalid value of opmode""

parents ae7ebc3f 56cbb0d7

drivers/usb/typec/class.c

+1 −2
Original line number Diff line number Diff line
@@ -1369,8 +1369,7 @@ void typec_set_pwr_opmode(struct typec_port *port, 
{

	struct device *partner_dev;



	if ((port->pwr_opmode == opmode) || (opmode < TYPEC_PWR_MODE_USB) ||

						(opmode > TYPEC_PWR_MODE_MAX))

	if (port->pwr_opmode == opmode)

		return;



	port->pwr_opmode = opmode;

include/linux/usb/typec.h

+0 −1
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ 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 {