---

yaml --- r: 219479 b: refs/heads/master c: 09c8dd8 h: refs/heads/master i: 219477: 8b8efdc 219475: ee95892 219471: 55f820a v: v3
git-mirror · Oct 22, 2010 · ca8efa9 · ca8efa9
1 parent cc71803
commit ca8efa9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 715d29a74450696696dc064f85ba4ff0eaadb1d2
+refs/heads/master: 09c8dd8de67cf781be95d809cd45af22f40c37df
diff --git a/trunk/drivers/media/IR/lirc_dev.c b/trunk/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);
 	}