diff options
| author | Paul Zimmerman <Paul.Zimmerman@synopsys.com> | 2012-02-24 17:32:16 -0800 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2012-03-02 12:12:10 +0200 |
| commit | 249a456930cd2df29d085fb738b0e8f4bc1680cf (patch) | |
| tree | f647de409868ab4650ebae3215a9c6ba6112c59c | |
| parent | aee63e3cb6b0396b99c6387a47cb90a7417f3957 (diff) | |
| download | blackbird-op-linux-249a456930cd2df29d085fb738b0e8f4bc1680cf.tar.gz blackbird-op-linux-249a456930cd2df29d085fb738b0e8f4bc1680cf.zip | |
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>
| -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: static int dwc3_gadget_ep_set_wedge(struct usb_ep *ep) { struct dwc3_ep *dep = to_dwc3_ep(ep); + struct dwc3 *dwc = dep->dwc; + unsigned long flags; + spin_lock_irqsave(&dwc->lock, flags); dep->flags |= DWC3_EP_WEDGE; + spin_unlock_irqrestore(&dwc->lock, flags); return dwc3_gadget_ep_set_halt(ep, 1); } @@ -1323,8 +1327,11 @@ static int dwc3_gadget_set_selfpowered(struct usb_gadget *g, int is_selfpowered) { struct dwc3 *dwc = gadget_to_dwc(g); + unsigned long flags; + spin_lock_irqsave(&dwc->lock, flags); dwc->is_selfpowered = !!is_selfpowered; + spin_unlock_irqrestore(&dwc->lock, flags); return 0; } |
