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

Commit fa50d319 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "USB: gadget: qdss: Fix null pointer dereference"

parents b367163a 92a3d6bf

drivers/usb/gadget/function/f_qdss.c

+6 −3
Original line number Diff line number Diff line
@@ -482,14 +482,15 @@ static void qdss_unbind(struct usb_configuration *c, struct usb_function *f) 
{

	struct f_qdss  *qdss = func_to_qdss(f);

	struct usb_gadget *gadget = c->cdev->gadget;

	enum transport_type dxport = qdss_ports[qdss->port_num].data_xport;

	int i;



	pr_debug("qdss_unbind\n");



	flush_workqueue(qdss->wq);

	if (dxport ==  USB_GADGET_XPORT_BAM2BAM_IPA)

		ipa_data_flush_workqueue();





	c->cdev->gadget->bam2bam_func_enabled = false;

	clear_eps(f);

	clear_desc(gadget, f);
@@ -1043,6 +1044,8 @@ static int qdss_bind_config(struct usb_configuration *c, unsigned char portno) 
		kfree(name);

		kfree(qdss);

	}

	if (dxport == USB_GADGET_XPORT_BAM2BAM_IPA ||

			dxport == USB_GADGET_XPORT_BAM2BAM)

		c->cdev->gadget->bam2bam_func_enabled = true;



	return status;