Merge "usb: android: Skip the work when set_config arrives with same value twice" (f65cc2d0) · Commits · e / devices / android_kernel_sony_msm8994

drivers/usb/gadget/android.c

+9 −1

Original line number	Diff line number	Diff line
		@@ -3339,6 +3339,7 @@ android_setup(struct usb_gadget gadget, const struct usb_ctrlrequest c)
		int value = -EOPNOTSUPP;
		unsigned long flags;
		bool do_work = false;
		bool prev_configured = false;

		req->zero = 0;
		req->length = 0;
		@@ -3357,6 +3358,12 @@ android_setup(struct usb_gadget gadget, const struct usb_ctrlrequest c)
		}
		}

		/*
		* skip the work when 2nd set config arrives
		* with same value from the host.
		*/
		if (cdev->config)
		prev_configured = true;
		/* Special case the accessory function.
		* It needs to handle control requests before it is enabled.
		*/
		@@ -3372,6 +3379,7 @@ android_setup(struct usb_gadget gadget, const struct usb_ctrlrequest c)
		do_work = true;
		} else if (c->bRequest == USB_REQ_SET_CONFIGURATION &&
		cdev->config) {
		if (!prev_configured)
		do_work = true;
		}
		spin_unlock_irqrestore(&cdev->lock, flags);