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

Commit 6efd8cc8 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: gadget: Fix support for 2 serial ports over char_bridge"

parents 618e373e 52edc3a8

drivers/usb/gadget/function/f_serial.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -1196,6 +1196,7 @@ int gserial_init_port(int port_num, const char *name, 
		no_smd_ports++;

		no_smd_ports++;

		break;

		break;

	case USB_GADGET_XPORT_CHAR_BRIDGE:

	case USB_GADGET_XPORT_CHAR_BRIDGE:

		gserial_ports[port_num].client_port_num = no_char_bridge_ports;

		no_char_bridge_ports++;

		no_char_bridge_ports++;

		break;

		break;

	case USB_GADGET_XPORT_HSIC:

	case USB_GADGET_XPORT_HSIC:

drivers/usb/gadget/function/u_data_bridge.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -888,7 +888,7 @@ static void gbridge_debugfs_init(void) {} 
int gbridge_setup(void *gptr, u8 no_ports)

int gbridge_setup(void *gptr, u8 no_ports)

{

{

	pr_debug("gptr:%pK, no_bridge_ports:%d\n", gptr, no_ports);

	pr_debug("gptr:%pK, no_bridge_ports:%d\n", gptr, no_ports);

	if (no_ports >= num_of_instance) {

	if (no_ports > num_of_instance) {

		pr_err("More ports are requested\n");

		pr_err("More ports are requested\n");

		return -EINVAL;

		return -EINVAL;

	}

	}