summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <m.chehab@samsung.com>2014-08-08 07:27:20 -0300
committerChanho Park <chanho61.park@samsung.com>2014-11-18 12:00:26 +0900
commit205d630813571919f77e8eff7c3905eda26213ce (patch)
treee2d0c3dd360b8239f4491a7b57e1386b3bcacc7e /drivers
parent85269e7da90c95f5947d7845cc66544f67686524 (diff)
downloadlinux-3.10-205d630813571919f77e8eff7c3905eda26213ce.tar.gz
linux-3.10-205d630813571919f77e8eff7c3905eda26213ce.tar.bz2
linux-3.10-205d630813571919f77e8eff7c3905eda26213ce.zip
[media] au0828: avoid race conditions at RC stop
As the RC kthread can re-enable IR int, we should first cancel the kthread and then disable IR int. While here, remove a temporary debug printk. Change-Id: I36ab0a218c0f88c39b023e7bd0eed7b7bdbc2d0c Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/usb/au0828/au0828-input.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/usb/au0828/au0828-input.c b/drivers/media/usb/au0828/au0828-input.c
index fcb90652558..7e6f4ab2e4d 100644
--- a/drivers/media/usb/au0828/au0828-input.c
+++ b/drivers/media/usb/au0828/au0828-input.c
@@ -253,10 +253,10 @@ static void au0828_rc_stop(struct rc_dev *rc)
{
struct au0828_rc *ir = rc->priv;
+ cancel_delayed_work_sync(&ir->work);
+
/* Disable IR */
au8522_rc_clear(ir, 0xe0, 1 << 4);
-
- cancel_delayed_work_sync(&ir->work);
}
static int au0828_probe_i2c_ir(struct au0828_dev *dev)