Merge "USB: android: Handle composition switch failure for ACM function" (97d5ac84) · Commits · e / devices / android_kernel_sony_msm8994

drivers/usb/gadget/android.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -714,6 +714,7 @@ err_usb_add_function:
		while (i-- > 0)
		usb_remove_function(c, config->f_acm[i]);

		config->instances_on = 0;
		return err;

		err_usb_get_function_instance:
		@@ -724,17 +725,15 @@ err_usb_get_function:
		}

		out:
		config->instances_on = 0;
		return err;
		}

		static void acm_function_unbind_config(struct android_usb_function *f,
		struct usb_configuration *c)
		{
		int i;
		struct acm_function_config *config = f->config;

		for (i = 0; i < config->instances_on; i++)
		usb_remove_function(c, config->f_acm[i]);
		config->instances_on = 0;
		}

		static ssize_t acm_transports_store(