Merge "usb: gadget: qdss: Fix usage of usb_ep_autoconfig()" (393284bd) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/usb/gadget/function/f_qdss.c

+10 −17

Original line number	Diff line number	Diff line
		@@ -402,7 +402,7 @@ static int qdss_bind(struct usb_configuration c, struct usb_function f)
		if (!strcmp(qdss->ch.name, USB_QDSS_CH_MDM))
		qdss_data_ep_comp_desc.bMaxBurst = 0;

		ep = usb_ep_autoconfig(gadget, &qdss_ss_data_desc);
		ep = usb_ep_autoconfig(gadget, &qdss_fs_data_desc);
		if (!ep) {
		pr_err("%s: ep_autoconfig error\n", __func__);
		goto clear_ep;
		@@ -414,7 +414,7 @@ static int qdss_bind(struct usb_configuration c, struct usb_function f)
		msm_ep_set_endless(qdss->port.data, true);

		if (qdss->debug_inface_enabled) {
		ep = usb_ep_autoconfig(gadget, &qdss_ss_ctrl_in_desc);
		ep = usb_ep_autoconfig(gadget, &qdss_fs_ctrl_in_desc);
		if (!ep) {
		pr_err("%s: ep_autoconfig error\n", __func__);
		goto clear_ep;
		@@ -423,7 +423,7 @@ static int qdss_bind(struct usb_configuration c, struct usb_function f)
		qdss->port.ctrl_in = ep;
		ep->driver_data = qdss;

		ep = usb_ep_autoconfig(gadget, &qdss_ss_ctrl_out_desc);
		ep = usb_ep_autoconfig(gadget, &qdss_fs_ctrl_out_desc);
		if (!ep) {
		pr_err("%s: ep_autoconfig error\n", __func__);
		goto clear_ep;
		@@ -441,24 +441,17 @@ static int qdss_bind(struct usb_configuration c, struct usb_function f)
		}
		}

		/update fs descriptors/
		qdss_fs_data_desc.bEndpointAddress =
		qdss_ss_data_desc.bEndpointAddress;
		if (qdss->debug_inface_enabled) {
		qdss_fs_ctrl_in_desc.bEndpointAddress =
		qdss_ss_ctrl_in_desc.bEndpointAddress;
		qdss_fs_ctrl_out_desc.bEndpointAddress =
		qdss_ss_ctrl_out_desc.bEndpointAddress;
		}

		/update descriptors/
		/* update hs/ss descriptors */
		qdss_hs_data_desc.bEndpointAddress =
		qdss_ss_data_desc.bEndpointAddress;
		qdss_ss_data_desc.bEndpointAddress =
		qdss_fs_data_desc.bEndpointAddress;
		if (qdss->debug_inface_enabled) {
		qdss_hs_ctrl_in_desc.bEndpointAddress =
		qdss_ss_ctrl_in_desc.bEndpointAddress;
		qdss_ss_ctrl_in_desc.bEndpointAddress =
		qdss_fs_ctrl_in_desc.bEndpointAddress;
		qdss_hs_ctrl_out_desc.bEndpointAddress =
		qdss_ss_ctrl_out_desc.bEndpointAddress;
		qdss_ss_ctrl_out_desc.bEndpointAddress =
		qdss_fs_ctrl_out_desc.bEndpointAddress;
		}

		if (qdss->debug_inface_enabled)