From 09c8dd8de67cf781be95d809cd45af22f40c37df Mon Sep 17 00:00:00 2001 From: Jarod Wilson Date: Mon, 18 Oct 2010 17:30:20 -0300 Subject: [media] lirc_dev: call cdev_del *after* irctl cleanup Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab --- drivers/media/IR/lirc_dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/media/IR') diff --git a/drivers/media/IR/lirc_dev.c b/drivers/media/IR/lirc_dev.c index e3dbf12..8fdb7e1 100644 --- a/drivers/media/IR/lirc_dev.c +++ b/drivers/media/IR/lirc_dev.c @@ -402,7 +402,6 @@ int lirc_unregister_driver(int minor) ir->d.set_use_dec(ir->d.data); module_put(ir->cdev.owner); mutex_unlock(&ir->irctl_lock); - cdev_del(&ir->cdev); } else { lirc_irctl_cleanup(ir); cdev_del(&ir->cdev); @@ -492,6 +491,7 @@ int lirc_dev_fop_close(struct inode *inode, struct file *file) module_put(ir->cdev.owner); } else { lirc_irctl_cleanup(ir); + cdev_del(&ir->cdev); irctls[ir->d.minor] = NULL; kfree(ir); } -- cgit v1.1