diff options
| author | Alex Shi <alex.shi@linaro.org> | 2018-02-01 12:02:34 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2018-02-01 12:02:34 +0800 |
| commit | a40f2a595adfe0be6ced06fdb4c4a24ae3291a91 (patch) | |
| tree | 4e99ec8bd3ce134bdbafd54a0fc873f11c33e21b /drivers/usb/usbip/usbip_event.c | |
| parent | 293c379504006b5ea8b4e7109ba4ebc3211f9b91 (diff) | |
| parent | 49fe90b853dfb1087d0a734cd7f4af1aa00c8e53 (diff) | |
Merge tag 'v4.4.114' into linux-linaro-lsk-v4.4lsk-v4.4-18.02
This is the 4.4.114 stable release
Diffstat (limited to 'drivers/usb/usbip/usbip_event.c')
| -rw-r--r-- | drivers/usb/usbip/usbip_event.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/usbip/usbip_event.c b/drivers/usb/usbip/usbip_event.c index 64933b993d7a..2580a32bcdff 100644 --- a/drivers/usb/usbip/usbip_event.c +++ b/drivers/usb/usbip/usbip_event.c @@ -117,11 +117,12 @@ EXPORT_SYMBOL_GPL(usbip_event_add); int usbip_event_happened(struct usbip_device *ud) { int happened = 0; + unsigned long flags; - spin_lock(&ud->lock); + spin_lock_irqsave(&ud->lock, flags); if (ud->event != 0) happened = 1; - spin_unlock(&ud->lock); + spin_unlock_irqrestore(&ud->lock, flags); return happened; } |