summaryrefslogtreecommitdiff
path: root/drivers/usb/gadget
diff options
context:
space:
mode:
authorFelipe Balbi <balbi@ti.com>2011-08-15 16:02:25 (GMT)
committerFelipe Balbi <balbi@ti.com>2011-08-15 16:02:25 (GMT)
commit200b0182f95a1f97c9fefee88707fb15ce87c22d (patch)
treea4ad1cacfeb07258aeb862c6505cd93560d7adb6 /drivers/usb/gadget
parentce7e9065958191e6b7ca49d7ed0e1099c486d198 (diff)
parent6193d6997c90535af8f8491fc0019f785a3322b0 (diff)
downloadlinux-fsl-qoriq-200b0182f95a1f97c9fefee88707fb15ce87c22d.tar.xz
Merge branch 'fixes' into for-greg
Diffstat (limited to 'drivers/usb/gadget')
-rw-r--r--drivers/usb/gadget/f_phonet.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/gadget/f_phonet.c b/drivers/usb/gadget/f_phonet.c
index 8f8d3f6..8f3eab1 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)
config_ep_by_speed(gadget, f, fp->out_ep)) {
fp->in_ep->desc = NULL;
fp->out_ep->desc = NULL;
+ spin_unlock(&port->lock);
return -EINVAL;
}
usb_ep_enable(fp->out_ep);