diff options
author | Paul Zimmerman <Paul.Zimmerman@synopsys.com> | 2012-02-24 20:32:16 -0500 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2012-03-02 05:12:10 -0500 |
commit | 249a456930cd2df29d085fb738b0e8f4bc1680cf (patch) | |
tree | f647de409868ab4650ebae3215a9c6ba6112c59c /drivers/usb/dwc3/gadget.c | |
parent | aee63e3cb6b0396b99c6387a47cb90a7417f3957 (diff) |
usb: dwc3: take lock while modifying flags
dwc3_gadget_ep_set_wedge() and dwc3_gadget_set_selfpowered() were
modifying dwc->flags/dwc->is_selfpowered without taking the lock.
Since those modifications are non-atomic, that could cause other
flags to be corrupted. Fix them both to take the lock.
Signed-off-by: Paul Zimmerman <paulz@synopsys.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/dwc3/gadget.c')
-rw-r--r-- | drivers/usb/dwc3/gadget.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index e2633dd03f8c..bfdfd4f151f8 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c | |||
@@ -1196,8 +1196,12 @@ out: | |||
1196 | static int dwc3_gadget_ep_set_wedge(struct usb_ep *ep) | 1196 | static int dwc3_gadget_ep_set_wedge(struct usb_ep *ep) |
1197 | { | 1197 | { |
1198 | struct dwc3_ep *dep = to_dwc3_ep(ep); | 1198 | struct dwc3_ep *dep = to_dwc3_ep(ep); |
1199 | struct dwc3 *dwc = dep->dwc; | ||
1200 | unsigned long flags; | ||
1199 | 1201 | ||
1202 | spin_lock_irqsave(&dwc->lock, flags); | ||
1200 | dep->flags |= DWC3_EP_WEDGE; | 1203 | dep->flags |= DWC3_EP_WEDGE; |
1204 | spin_unlock_irqrestore(&dwc->lock, flags); | ||
1201 | 1205 | ||
1202 | return dwc3_gadget_ep_set_halt(ep, 1); | 1206 | return dwc3_gadget_ep_set_halt(ep, 1); |
1203 | } | 1207 | } |
@@ -1323,8 +1327,11 @@ static int dwc3_gadget_set_selfpowered(struct usb_gadget *g, | |||
1323 | int is_selfpowered) | 1327 | int is_selfpowered) |
1324 | { | 1328 | { |
1325 | struct dwc3 *dwc = gadget_to_dwc(g); | 1329 | struct dwc3 *dwc = gadget_to_dwc(g); |
1330 | unsigned long flags; | ||
1326 | 1331 | ||
1332 | spin_lock_irqsave(&dwc->lock, flags); | ||
1327 | dwc->is_selfpowered = !!is_selfpowered; | 1333 | dwc->is_selfpowered = !!is_selfpowered; |
1334 | spin_unlock_irqrestore(&dwc->lock, flags); | ||
1328 | 1335 | ||
1329 | return 0; | 1336 | return 0; |
1330 | } | 1337 | } |