Merge branch 'perf/core' into perf/urgent, to pick up the latest fixes

[deliverable/linux.git] / drivers / staging / vt6656 / int.c

diff --git a/drivers/staging/vt6656/int.c b/drivers/staging/vt6656/int.c
index cca56b2f243dd83c0bc78dd2b82d8a7f19537119..f2a5225b50f82bc6c64398e3efbd0adbf110cee7 100644 (file)
--- a/drivers/staging/vt6656/int.c
+++ b/drivers/staging/vt6656/int.c
@@ -65,15 +65,16 @@ static int msglevel = MSG_LEVEL_INFO; /* MSG_LEVEL_DEBUG */
 -*/
 void INTvWorkItem(struct vnt_private *pDevice)
 {
+       unsigned long flags;
        int ntStatus;
 
        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->Interrupt Polling Thread\n");
 
-       spin_lock_irq(&pDevice->lock);
+       spin_lock_irqsave(&pDevice->lock, flags);
 
        ntStatus = PIPEnsInterruptRead(pDevice);
 
-       spin_unlock_irq(&pDevice->lock);
+       spin_unlock_irqrestore(&pDevice->lock, flags);
 }
 
 void INTnsProcessData(struct vnt_private *priv)