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

Commit 655a39d4 authored by Jack Pham's avatar Jack Pham Committed by Matt Wagantall
Browse files

usb: gadget: u_bam_data: Fix port parameter in start/stop_rndis_ipa() 



commit 9a03014e (usb: gadget: allow working with multiple u_bam_data
ports simultaneously) changed the mapping of the RNDIS entry in
the global bam2bam_data_ports array but missed updating these two
functions, so they incorrectly use index 0. Fix these to use the
u_bam_data_func_to_port() helper.

Change-Id: Ib4a44b26a473e2021d748486820d33541b8e1bae
Signed-off-by: default avatarJack Pham <jackp@codeaurora.org>
parent a7d4d350

drivers/usb/gadget/function/u_bam_data.c

+7 −6
Original line number Diff line number Diff line
@@ -1355,8 +1355,9 @@ void u_bam_data_start_rndis_ipa(void) 
	pr_debug("%s\n", __func__);



	if (!is_ipa_rndis_net_on) {

		struct bam_data_port *port =

			bam2bam_data_ports[RNDIS_QC_ACTIVE_PORT];

		int port_num = u_bam_data_func_to_port(USB_FUNC_RNDIS,

							RNDIS_QC_ACTIVE_PORT);

		struct bam_data_port *port = bam2bam_data_ports[port_num];



		if (port->rndis_s == RNDIS_SOFT_DISABLE)

			port->rndis_s = RNDIS_SOFT_ENABLE;
@@ -1371,15 +1372,15 @@ void u_bam_data_stop_rndis_ipa(void) 
	pr_debug("%s\n", __func__);



	if (is_ipa_rndis_net_on) {

		struct bam_data_port *port =

			bam2bam_data_ports[RNDIS_QC_ACTIVE_PORT];

		int port_num = u_bam_data_func_to_port(USB_FUNC_RNDIS,

							RNDIS_QC_ACTIVE_PORT);

		struct bam_data_port *port = bam2bam_data_ports[port_num];



		rndis_ipa_reset_trigger();

		bam_data_stop_endless_tx(port);

		port->rndis_s = RNDIS_SOFT_DISABLE;

		rndis_data.adaptor_disable = true;

		bam_data_disconnect(port->port_usb,

					RNDIS_QC_ACTIVE_PORT);

		bam_data_disconnect(port->port_usb, port_num);

	}

}