commit fb2b0065756a5ed6b6852e663574f9331d47fdec
author Heiner Kallweit <hkallweit1@gmail.com> Wed Dec 30 14:44:36 2015 -0200
committer Mauro Carvalho Chehab <mchehab@osg.samsung.com> Mon Feb 01 08:49:55 2016 -0200
tree b2b0968d6a9dfb70a0cc64ccb2ec64a8ca7de30e
parent 3f1321cbaa1f2221be7444b7fab0905a31bdfd9f

[media] media: rc: nuvoton-cir: add locking to calls of nvt_enable_wake

Add locking to nvt_enable_wake calls.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

drivers/media/rc/nuvoton-cir.c

diff --git a/drivers/media/rc/nuvoton-cir.c b/drivers/media/rc/nuvoton-cir.c
index f587a72..3097ff0 100644
--- a/drivers/media/rc/nuvoton-cir.c
+++ b/drivers/media/rc/nuvoton-cir.c
@@ -1174,16 +1174,16 @@
 
 	nvt_dbg("%s called", __func__);
 
-	/* zero out misc state tracking */
-	spin_lock_irqsave(&nvt->nvt_lock, flags);
-	nvt->study_state = ST_STUDY_NONE;
-	nvt->wake_state = ST_WAKE_NONE;
-	spin_unlock_irqrestore(&nvt->nvt_lock, flags);
-
 	spin_lock_irqsave(&nvt->tx.lock, flags);
 	nvt->tx.tx_state = ST_TX_NONE;
 	spin_unlock_irqrestore(&nvt->tx.lock, flags);
 
+	spin_lock_irqsave(&nvt->nvt_lock, flags);
+
+	/* zero out misc state tracking */
+	nvt->study_state = ST_STUDY_NONE;
+	nvt->wake_state = ST_WAKE_NONE;
+
 	/* disable all CIR interrupts */
 	nvt_cir_reg_write(nvt, 0, CIR_IREN);
 
@@ -1193,6 +1193,8 @@
 	/* make sure wake is enabled */
 	nvt_enable_wake(nvt);
 
+	spin_unlock_irqrestore(&nvt->nvt_lock, flags);
+
 	return 0;
 }
 
@@ -1211,7 +1213,11 @@
 static void nvt_shutdown(struct pnp_dev *pdev)
 {
 	struct nvt_dev *nvt = pnp_get_drvdata(pdev);
+	unsigned long flags;
+
+	spin_lock_irqsave(&nvt->nvt_lock, flags);
 	nvt_enable_wake(nvt);
+	spin_unlock_irqrestore(&nvt->nvt_lock, flags);
 }
 
 static const struct pnp_device_id nvt_ids[] = {