Merge "usb: gadget: u_bam_data: Fix bam2bam_ipa port related check" (5f368015) · Commits · e / devices / android_kernel_xiaomi_markw

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;
		}