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

Commit 2f6aef8f authored by Mayank Rana's avatar Mayank Rana
Browse files

usb: gadget: u_bam_data: Fix bam2bam_ipa port related check 



Commit c6079f4e ("USB: f_mbim: Add support for BAM-DMUX transport")
has moved creating bam2bam_data_port for MBIM function from mbim_init()
to mbim_bind_config() which fails check of port_num against
n_bam2bam_data_ports while moving to RNDIS USB composition. Fix this
issue by avoiding check of port_num against n_bam2bam_data_ports as
u_bam_data_func_to_port() is already taking care of checking upper bound
for port number.

CRs-Fixed: 905382
Change-Id: I0d42a0f9a3592dff5db9a060b901c3f6070106e3
Signed-off-by: default avatarMayank Rana <mrana@codeaurora.org>
parent 9fffca4f

drivers/usb/gadget/function/u_bam_data.c

+4 −4
Original line number Diff line number Diff line
@@ -1319,7 +1319,7 @@ void bam_data_disconnect(struct data_port *gr, enum function_type func, 
	int port_num;



	port_num = u_bam_data_func_to_port(func, dev_port_num);

	if (port_num < 0 || port_num >= n_bam2bam_data_ports) {

	if (port_num < 0) {

		pr_err("invalid bam2bam portno#%d\n", port_num);

		return;

	}
@@ -1460,7 +1460,7 @@ int bam_data_connect(struct data_port *gr, enum transport_type trans, 
	}



	port_num = u_bam_data_func_to_port(func, dev_port_num);

	if (port_num < 0 || port_num >= n_bam2bam_data_ports) {

	if (port_num < 0) {

		pr_err("invalid portno#%d\n", port_num);

		return -EINVAL;

	}
@@ -1801,7 +1801,7 @@ void bam_data_suspend(struct data_port *port_usb, u8 dev_port_num, 
	int port_num;



	port_num = u_bam_data_func_to_port(func, dev_port_num);

	if (port_num < 0 || port_num >= n_bam2bam_data_ports) {

	if (port_num < 0) {

		pr_err("invalid bam2bam portno#%d\n", port_num);

		return;

	}
@@ -1848,7 +1848,7 @@ void bam_data_resume(struct data_port *port_usb, u8 dev_port_num, 
	int port_num;



	port_num = u_bam_data_func_to_port(func, dev_port_num);

	if (port_num < 0 || port_num >= n_bam2bam_data_ports) {

	if (port_num < 0) {

		pr_err("invalid bam2bam portno#%d\n", port_num);

		return;

	}