[media] lirc_dev: call cdev_del *after* irctl cleanup
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
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 @@
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 @@
module_put(ir->cdev.owner);
} else {
lirc_irctl_cleanup(ir);
+ cdev_del(&ir->cdev);
irctls[ir->d.minor] = NULL;
kfree(ir);
}