From ca8efa9cae5bba2c717b7ecd4330475e864ca1a8 Mon Sep 17 00:00:00 2001 From: Jarod Wilson Date: Mon, 18 Oct 2010 17:30:20 -0300 Subject: [PATCH] --- yaml --- r: 219479 b: refs/heads/master c: 09c8dd8de67cf781be95d809cd45af22f40c37df h: refs/heads/master i: 219477: 8b8efdc0a26f41e9ae24ff357b42a076955a1dcd 219475: ee958921096cae1ed59492a78e48ebf2e9080bec 219471: 55f820ab54c3812c941b136d3da8c10820148b55 v: v3 --- [refs] | 2 +- trunk/drivers/media/IR/lirc_dev.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7db2eea1f6c3..729d58d95b0f 100644 --- 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 index e3dbf12d00d9..8fdb7e11a138 100644 --- 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); }