1 files changed, 8 insertions, 6 deletions

diff --git a/drivers/usb/usbip/vhci_tx.c b/drivers/usb/usbip/vhci_tx.c
index 409fd99f3257..3e7878fe2fd4 100644
--- a/drivers/usb/usbip/vhci_tx.c
+++ b/drivers/usb/usbip/vhci_tx.c
@@ -47,16 +47,17 @@ static void setup_cmd_submit_pdu(struct usbip_header *pdup,  struct urb *urb)
 static struct vhci_priv *dequeue_from_priv_tx(struct vhci_device *vdev)
 {
         struct vhci_priv *priv, *tmp;
+        unsigned long flags;
 
-        spin_lock(&vdev->priv_lock);
+        spin_lock_irqsave(&vdev->priv_lock, flags);
 
         list_for_each_entry_safe(priv, tmp, &vdev->priv_tx, list) {
                 list_move_tail(&priv->list, &vdev->priv_rx);
-                spin_unlock(&vdev->priv_lock);
+                spin_unlock_irqrestore(&vdev->priv_lock, flags);
                 return priv;
         }
 
-        spin_unlock(&vdev->priv_lock);
+        spin_unlock_irqrestore(&vdev->priv_lock, flags);
 
         return NULL;
 }
@@ -136,16 +137,17 @@ static int vhci_send_cmd_submit(struct vhci_device *vdev)
 static struct vhci_unlink *dequeue_from_unlink_tx(struct vhci_device *vdev)
 {
         struct vhci_unlink *unlink, *tmp;
+        unsigned long flags;
 
-        spin_lock(&vdev->priv_lock);
+        spin_lock_irqsave(&vdev->priv_lock, flags);
 
         list_for_each_entry_safe(unlink, tmp, &vdev->unlink_tx, list) {
                 list_move_tail(&unlink->list, &vdev->unlink_rx);
-                spin_unlock(&vdev->priv_lock);
+                spin_unlock_irqrestore(&vdev->priv_lock, flags);
                 return unlink;
         }
 
-        spin_unlock(&vdev->priv_lock);
+        spin_unlock_irqrestore(&vdev->priv_lock, flags);
 
         return NULL;
 }