diff options
| author | Felipe Balbi <balbi@ti.com> | 2011-08-15 12:02:25 -0400 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2011-08-15 12:02:25 -0400 |
| commit | 200b0182f95a1f97c9fefee88707fb15ce87c22d (patch) | |
| tree | a4ad1cacfeb07258aeb862c6505cd93560d7adb6 /drivers/usb/gadget | |
| parent | ce7e9065958191e6b7ca49d7ed0e1099c486d198 (diff) | |
| parent | 6193d6997c90535af8f8491fc0019f785a3322b0 (diff) | |
Merge branch 'fixes' into for-greg
Diffstat (limited to 'drivers/usb/gadget')
| -rw-r--r-- | drivers/usb/gadget/f_phonet.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/gadget/f_phonet.c b/drivers/usb/gadget/f_phonet.c index 8f8d3f6cd89e..8f3eab1af885 100644 --- a/drivers/usb/gadget/f_phonet.c +++ b/drivers/usb/gadget/f_phonet.c | |||
| @@ -434,6 +434,7 @@ static int pn_set_alt(struct usb_function *f, unsigned intf, unsigned alt) | |||
| 434 | config_ep_by_speed(gadget, f, fp->out_ep)) { | 434 | config_ep_by_speed(gadget, f, fp->out_ep)) { |
| 435 | fp->in_ep->desc = NULL; | 435 | fp->in_ep->desc = NULL; |
| 436 | fp->out_ep->desc = NULL; | 436 | fp->out_ep->desc = NULL; |
| 437 | spin_unlock(&port->lock); | ||
| 437 | return -EINVAL; | 438 | return -EINVAL; |
| 438 | } | 439 | } |
| 439 | usb_ep_enable(fp->out_ep); | 440 | usb_ep_enable(fp->out_ep); |