Merge "usb: composite: don't print the invalid function wakeup failure messages" (c4395339) · Commits · e / devices / samsung / android_kernel_samsung_msm8916

drivers/usb/gadget/composite.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -436,7 +436,7 @@ int usb_func_wakeup(struct usb_function *func)
		"Function wakeup for %s could not complete due to suspend state. Delayed until after bus resume.\n",
		func->name ? func->name : "");
		ret = 0;
		} else if (ret < 0) {
		} else if (ret < 0 && ret != -ENOTSUPP) {
		ERROR(func->config->cdev,
		"Failed to wake function %s from suspend state. ret=%d. Canceling USB request.\n",
		func->name ? func->name : "", ret);
		@@ -1921,7 +1921,7 @@ composite_resume(struct usb_gadget *gadget)
		"Function wakeup for %s could not complete due to suspend state.\n",
		f->name ? f->name : "");
		break;
		} else {
		} else if (ret != -ENOTSUPP) {
		ERROR(f->config->cdev,
		"Failed to wake function %s from suspend state. ret=%d. Canceling USB request.\n",
		f->name ? f->name : "",