diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-12-26 02:52:51 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-12-26 02:52:51 -0800 |
| commit | 86bc01ea1bf42a60ef21bdba5ecdb5a50b6a7a25 (patch) | |
| tree | 0df35f517018b0eebf5e0e7a9e7f8642d584ea54 | |
| parent | f1af8c5dc7e5af4f8e09e614ef3302311e2eb4b0 (diff) | |
| parent | 108c841217974da6e7d9197e404c27dbeeaa8641 (diff) | |
Merge "usb: gadget: u_audio: Check return value from config_ep_by_speed()"
| -rw-r--r-- | drivers/usb/gadget/function/u_audio.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/usb/gadget/function/u_audio.c b/drivers/usb/gadget/function/u_audio.c index d3a639297e06..435f0614d572 100644 --- a/drivers/usb/gadget/function/u_audio.c +++ b/drivers/usb/gadget/function/u_audio.c @@ -380,11 +380,14 @@ int u_audio_start_capture(struct g_audio *audio_dev) struct usb_ep *ep; struct uac_rtd_params *prm; struct uac_params *params = &audio_dev->params; - int req_len, i; + int req_len, i, ret; ep = audio_dev->out_ep; prm = &uac->c_prm; - config_ep_by_speed(gadget, &audio_dev->func, ep); + ret = config_ep_by_speed(gadget, &audio_dev->func, ep); + if (ret) + return ret; + req_len = prm->max_psize; prm->ep_enabled = true; @@ -433,11 +436,13 @@ int u_audio_start_playback(struct g_audio *audio_dev) struct uac_params *params = &audio_dev->params; unsigned int factor, rate; const struct usb_endpoint_descriptor *ep_desc; - int req_len, i; + int req_len, i, ret; ep = audio_dev->in_ep; prm = &uac->p_prm; - config_ep_by_speed(gadget, &audio_dev->func, ep); + ret = config_ep_by_speed(gadget, &audio_dev->func, ep); + if (ret) + return ret; ep_desc = ep->desc; |