From 0e7e572dea1c1546084826799eb4419e453f093e Mon Sep 17 00:00:00 2001 From: Jarod Wilson Date: Fri, 27 May 2011 17:14:51 -0300 Subject: [PATCH] --- yaml --- r: 254611 b: refs/heads/master c: 0ae90252d0b28265bc16cf272e72d62281f7baf1 h: refs/heads/master i: 254609: 5da08e84aa5fcca38e3e37f51b7d98fc81a4d09b 254607: 92fc1280213988747a53921e7408d54a8df389cb v: v3 --- [refs] | 2 +- trunk/drivers/media/rc/fintek-cir.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b25feb10e2ed..375bd3e9aece 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8de111e27688798623b9e9062235bb0cac29f599 +refs/heads/master: 0ae90252d0b28265bc16cf272e72d62281f7baf1 diff --git a/trunk/drivers/media/rc/fintek-cir.c b/trunk/drivers/media/rc/fintek-cir.c index 8fa539dde1b4..7f7079b12f23 100644 --- a/trunk/drivers/media/rc/fintek-cir.c +++ b/trunk/drivers/media/rc/fintek-cir.c @@ -597,12 +597,17 @@ static void __devexit fintek_remove(struct pnp_dev *pdev) static int fintek_suspend(struct pnp_dev *pdev, pm_message_t state) { struct fintek_dev *fintek = pnp_get_drvdata(pdev); + unsigned long flags; fit_dbg("%s called", __func__); + spin_lock_irqsave(&fintek->fintek_lock, flags); + /* disable all CIR interrupts */ fintek_cir_reg_write(fintek, CIR_STATUS_IRQ_MASK, CIR_STATUS); + spin_unlock_irqrestore(&fintek->fintek_lock, flags); + fintek_config_mode_enable(fintek); /* disable cir logical dev */