korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-19 18:24:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

[media] lirc_dev: call cdev_del *after* irctl cleanup

Browse Source 
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Jarod Wilson 2010-10-18 17:30:20 -03:00 committed by Mauro Carvalho Chehab
parent 715d29a744
commit 09c8dd8de6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/IR/lirc_dev.c
View File

@ -402,7 +402,6 @@ int lirc_unregister_driver(int minor)
ir->d.set_use_dec(ir->d.data); ir->d.set_use_dec(ir->d.data);
module_put(ir->cdev.owner); module_put(ir->cdev.owner);
mutex_unlock(&ir->irctl_lock); mutex_unlock(&ir->irctl_lock);
cdev_del(&ir->cdev);
} else { } else {
lirc_irctl_cleanup(ir); lirc_irctl_cleanup(ir);
cdev_del(&ir->cdev); cdev_del(&ir->cdev);
@ -492,6 +491,7 @@ int lirc_dev_fop_close(struct inode *inode, struct file *file)
module_put(ir->cdev.owner); module_put(ir->cdev.owner);
} else { } else {
lirc_irctl_cleanup(ir); lirc_irctl_cleanup(ir);
cdev_del(&ir->cdev);
irctls[ir->d.minor] = NULL; irctls[ir->d.minor] = NULL;
kfree(ir); kfree(ir);
} }