Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09c8dd8d authored by Jarod Wilson's avatar Jarod Wilson Committed by Mauro Carvalho Chehab
Browse files

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



Signed-off-by: default avatarJarod Wilson <jarod@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 715d29a7

drivers/media/IR/lirc_dev.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

	}