diff options
author | Tatyana Brokhman <tlinder@codeaurora.org> | 2011-06-28 09:33:50 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-28 14:14:37 -0400 |
commit | ea2a1df7b2b1de839a72217d85bfb4b7b049010c (patch) | |
tree | 89c10a2a18bba8a1d448b8b1f1281cf52b2287c6 /drivers/usb/gadget/f_phonet.c | |
parent | 48767a4e8263620c347c3fa17812c943dd0fc2fa (diff) |
usb: gadget: use config_ep_by_speed() instead of ep_choose()
Remove obsolete functions:
1. ep_choose()
2. usb_find_endpoint()
Signed-off-by: Tatyana Brokhman <tlinder@codeaurora.org>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/gadget/f_phonet.c')
-rw-r--r-- | drivers/usb/gadget/f_phonet.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/usb/gadget/f_phonet.c b/drivers/usb/gadget/f_phonet.c index dc63f161a10a..0d6d26090da9 100644 --- a/drivers/usb/gadget/f_phonet.c +++ b/drivers/usb/gadget/f_phonet.c | |||
@@ -429,12 +429,12 @@ static int pn_set_alt(struct usb_function *f, unsigned intf, unsigned alt) | |||
429 | if (alt == 1) { | 429 | if (alt == 1) { |
430 | int i; | 430 | int i; |
431 | 431 | ||
432 | fp->out_ep->desc = ep_choose(gadget, | 432 | if (config_ep_by_speed(gadget, f, fp->in_ep) || |
433 | &pn_hs_sink_desc, | 433 | config_ep_by_speed(gadget, f, fp->out_ep)) { |
434 | &pn_fs_sink_desc); | 434 | fp->in_ep->desc = NULL; |
435 | fp->in_ep->desc = ep_choose(gadget, | 435 | fp->out_ep->desc = NULL; |
436 | &pn_hs_source_desc, | 436 | return -EINVAL; |
437 | &pn_fs_source_desc); | 437 | } |
438 | usb_ep_enable(fp->out_ep); | 438 | usb_ep_enable(fp->out_ep); |
439 | usb_ep_enable(fp->in_ep); | 439 | usb_ep_enable(fp->in_ep); |
440 | 440 | ||