Merge "USB: android: Dont call functionfs_bind during android enable"

{

	struct android_dev *dev = f->android_dev;

	struct functionfs_config *config = f->config;

	int ret = 0;

	config->enabled = true;

	/* Disable the gadget until the function is ready */

	if (!config->opened) {

	if (!config->opened)

		android_disable(dev);

	} else {

		/*

		 * Call functionfs_bind to handle the case where userspace

		 * passed descriptors before updating enabled functions list

		 */

		ret = functionfs_bind(config->data, dev->cdev);

		if (ret)

			pr_err("%s: functionfs_bind failed (%d)\n", __func__,

									ret);

	}

}

static void ffs_function_disable(struct android_usb_function *f)