greybus: Revert "greybus: don't use spin_lock_irq()"

[cascardo/linux.git] / drivers / staging / greybus / es2.c

diff --git a/drivers/staging/greybus/es2.c b/drivers/staging/greybus/es2.c
index 89fe764..bdf5024 100644 (file)
--- a/drivers/staging/greybus/es2.c
+++ b/drivers/staging/greybus/es2.c
@@ -496,12 +496,11 @@ static void message_cancel(struct gb_message *message)
        struct gb_host_device *hd = message->operation->connection->hd;
        struct es2_ap_dev *es2 = hd_to_es2(hd);
        struct urb *urb;
-       unsigned long flags;
        int i;
 
        might_sleep();
 
-       spin_lock_irqsave(&es2->cport_out_urb_lock, flags);
+       spin_lock_irq(&es2->cport_out_urb_lock);
        urb = message->hcpriv;
 
        /* Prevent dynamically allocated urb from being deallocated. */
@@ -514,14 +513,14 @@ static void message_cancel(struct gb_message *message)
                        break;
                }
        }
-       spin_unlock_irqrestore(&es2->cport_out_urb_lock, flags);
+       spin_unlock_irq(&es2->cport_out_urb_lock);
 
        usb_kill_urb(urb);
 
        if (i < NUM_CPORT_OUT_URB) {
-               spin_lock_irqsave(&es2->cport_out_urb_lock, flags);
+               spin_lock_irq(&es2->cport_out_urb_lock);
                es2->cport_out_urb_cancelled[i] = false;
-               spin_unlock_irqrestore(&es2->cport_out_urb_lock, flags);
+               spin_unlock_irq(&es2->cport_out_urb_lock);
        }
 
        usb_free_urb(urb);