From: a17671 Date: Tue, 12 Feb 2019 06:28:45 +0000 (+0800) Subject: f_mtp:Remove the unneccessary QCOM changes X-Git-Tag: MMI-QSAS30.62-33-3~241 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b6c092c3d990dc48587332bd10f27a6c0cadc5ce;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git f_mtp:Remove the unneccessary QCOM changes QCOM mtp only allow one mtp instance at a time While Samsung needs to have both mtp and ptp instances Remove the unneccessary QCOM code Change-Id: I820b5dd84a3a651aa3c0b10da9fc2076b6097d68 Signed-off-by: a17671 Reviewed-on: https://gerrit.mot.com/1307514 SME-Granted: SME Approvals Granted SLTApproved: Slta Waiver Tested-by: Jira Key Reviewed-by: Xiangpo Zhao Reviewed-by: Jun Zhang Submit-Approved: Jira Key --- diff --git a/drivers/usb/gadget/function/f_mtp.c b/drivers/usb/gadget/function/f_mtp.c index d605b3262030..55e82c183d98 100644 --- a/drivers/usb/gadget/function/f_mtp.c +++ b/drivers/usb/gadget/function/f_mtp.c @@ -1393,7 +1393,6 @@ mtp_function_bind(struct usb_configuration *c, struct usb_function *f) mtp_ss_out_comp_desc.bMaxBurst = max_burst; } - fi_mtp->func_inst.f = &dev->function; DBG(cdev, "%s speed %s: IN/%s, OUT/%s\n", gadget_is_superspeed(c->cdev->gadget) ? "super" : (gadget_is_dualspeed(c->cdev->gadget) ? "dual" : "full"), @@ -1425,7 +1424,6 @@ mtp_function_unbind(struct usb_configuration *c, struct usb_function *f) spin_unlock_irq(&dev->lock); kfree(f->os_desc_table); f->os_desc_n = 0; - fi_mtp->func_inst.f = NULL; } static int mtp_function_set_alt(struct usb_function *f,