diff options
| author | Pavankumar Kondeti <pkondeti@codeaurora.org> | 2014-11-10 16:29:38 +0530 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-22 11:02:46 -0700 |
| commit | 691d89ad03d7ac5f8aded39b84ce0e831e07f044 (patch) | |
| tree | 5b6b3b73ff71687f1fe9870db87b09bba2d0b00e /drivers/usb/gadget/composite.c | |
| parent | 01b21ef8dc28ba597280f8230cc90446fbb4ca9c (diff) | |
usb: composite: don't print the invalid function wakeup failure messages
The function level suspend/resume/wakeup are supported in super speed
mode only. The usb_func_wakeup() is called for every function during
resume irrespective of the operating speed. This function returns
-ENOTSUPP when the gadget is not operating in super speed. Don't print
the error message in this case. Otherwise an error message is printed
for each function during high/full speed device resume.
CRs-Fixed: 750230
Change-Id: I6f600fe7fa9a037b83909265229acdc668329d6a
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
Diffstat (limited to 'drivers/usb/gadget/composite.c')
| -rw-r--r-- | drivers/usb/gadget/composite.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index ae82f856037b..283aa59ce9cd 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -461,7 +461,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); @@ -2317,7 +2317,7 @@ void 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 : "", |