Merge "USB: android: Enable streaming only during composition enable" (93672d9b) · Commits · e / devices / android_kernel_sony_msm8994

drivers/usb/gadget/android.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -3124,6 +3124,7 @@ functions_store(struct device pdev, struct device_attribute attr,
		strlcpy(buf, buff, sizeof(buf));
		b = strim(buf);

		dev->cdev->gadget->streaming_enabled = false;
		while (b) {
		conf_str = strsep(&b, ":");
		if (!conf_str)
		@@ -3452,10 +3453,6 @@ static void android_unbind_config(struct usb_configuration *c)
		{
		struct android_dev *dev = cdev_to_android_dev(c->cdev);

		if (c->cdev->gadget->streaming_enabled) {
		c->cdev->gadget->streaming_enabled = false;
		pr_debug("setting streaming_enabled to false.\n");
		}
		android_unbind_enabled_functions(dev, c);
		}