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

Commit dc805f4d 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: composite: Protect cdev in composite_suspend()"

parents f7b0736e 1d104f87
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -2249,11 +2249,13 @@ composite_suspend(struct usb_gadget *gadget)
{
	struct usb_composite_dev	*cdev = get_gadget_data(gadget);
	struct usb_function		*f;
	unsigned long			flags;

	/* REVISIT:  should we have config level
	 * suspend/resume callbacks?
	 */
	DBG(cdev, "suspend\n");
	spin_lock_irqsave(&cdev->lock, flags);
	if (cdev->config) {
		list_for_each_entry(f, &cdev->config->functions, list) {
			if (f->suspend)
@@ -2264,6 +2266,7 @@ composite_suspend(struct usb_gadget *gadget)
		cdev->driver->suspend(cdev);

	cdev->suspended = 1;
	spin_unlock_irqrestore(&cdev->lock, flags);

	usb_gadget_vbus_draw(gadget, 2);
}