usb: gadget: composite: dequeue cdev->req before free it in composite_dev_cleanup

Li Jun · Felipe Balbi · commit f2267089ea17 · 2014-07-16T10:05:01.000-05:00
This patch try to dequeue the cdev-&gt;req to guarantee the request is not queued
before free it.

Signed-off-by: Li Jun &lt;b47624@freescale.com&gt;
Signed-off-by: Felipe Balbi &lt;balbi@ti.com&gt;
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
@@ -1956,6 +1956,7 @@ void composite_dev_cleanup(struct usb_composite_dev *cdev)
 	}
 	if (cdev->req) {
 		kfree(cdev->req->buf);
+		usb_ep_dequeue(cdev->gadget->ep0, cdev->req);
 		usb_ep_free_request(cdev->gadget->ep0, cdev->req);
 	}
 	cdev->next_string_id = 0;

Original file line number	Diff line number	Diff line change
`@@ -1956,6 +1956,7 @@ void composite_dev_cleanup(struct usb_composite_dev *cdev)`
`1956`	`1956`	`}`
`1957`	`1957`	`if (cdev->req) {`
`1958`	`1958`	`kfree(cdev->req->buf);`
	`1959`	`+ usb_ep_dequeue(cdev->gadget->ep0, cdev->req);`
`1959`	`1960`	`usb_ep_free_request(cdev->gadget->ep0, cdev->req);`
`1960`	`1961`	`}`
`1961`	`1962`	`cdev->next_string_id = 0;`