From 34370d037e8870e5217657ff0c9b3cee658efbf7 Mon Sep 17 00:00:00 2001 From: Felipe Balbi Date: Fri, 22 Mar 2013 16:58:18 +0200 Subject: [PATCH] --- yaml --- r: 364773 b: refs/heads/master c: 94a06018dead7fc5f92238ececf31ed601ee528c h: refs/heads/master i: 364771: 54d1842fc9f372012af39062fc202eee4831416d v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/mv_udc_core.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4b0a83b209d6..f19596a60d62 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f8b620124d2f331b71936a8d17e0fa493182632 +refs/heads/master: 94a06018dead7fc5f92238ececf31ed601ee528c diff --git a/trunk/drivers/usb/gadget/mv_udc_core.c b/trunk/drivers/usb/gadget/mv_udc_core.c index 9a68c051a5a8..88be74e6297d 100644 --- a/trunk/drivers/usb/gadget/mv_udc_core.c +++ b/trunk/drivers/usb/gadget/mv_udc_core.c @@ -212,6 +212,8 @@ static int process_ep_req(struct mv_udc *udc, int index, * request is still in progress. */ static void done(struct mv_ep *ep, struct mv_req *req, int status) + __releases(&ep->udc->lock) + __acquires(&ep->udc->lock) { struct mv_udc *udc = NULL; unsigned char stopped = ep->stopped; @@ -1651,6 +1653,8 @@ static void ch9setfeature(struct mv_udc *udc, struct usb_ctrlrequest *setup) static void handle_setup_packet(struct mv_udc *udc, u8 ep_num, struct usb_ctrlrequest *setup) + __releases(&ep->udc->lock) + __acquires(&ep->udc->lock) { bool delegate = false; @@ -1847,7 +1851,7 @@ static void irq_process_tr_complete(struct mv_udc *udc) } } -void irq_process_reset(struct mv_udc *udc) +static void irq_process_reset(struct mv_udc *udc) { u32 tmp; unsigned int loops;