mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-23 17:30:02 +00:00
Code Issues Releases Wiki Activity

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

Browse source 
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>
This commit is contained in:
Heiner Kallweit 2015-12-30 14:44:36 -02:00 committed by Mauro Carvalho Chehab
parent 3f1321cbaa
commit fb2b006575
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/media/rc/nuvoton-cir.c
View file

@ -1174,16 +1174,16 @@ static int nvt_suspend(struct pnp_dev *pdev, pm_message_t state)
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 @@ static int nvt_suspend(struct pnp_dev *pdev, pm_message_t state)
/* make sure wake is enabled */
nvt_enable_wake(nvt);
spin_unlock_irqrestore(&nvt->nvt_lock, flags);
return 0;
}
@ -1211,7 +1213,11 @@ static int nvt_resume(struct pnp_dev *pdev)
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[] = {