Merge tag 'nfs-for-4.6-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[karo-tx-linux.git] / drivers / usb / usbip / usbip_event.c

diff --git a/drivers/usb/usbip/usbip_event.c b/drivers/usb/usbip/usbip_event.c
index 64933b993d7a5f0a8ff64a82979ed20bb9890534..2580a32bcdfff088d4e5f86af1e09f93b13c20ce 100644 (file)
--- 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;
 }