Commit a4436f8e authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman

staging: comedi: fix clean-up of comedi_class in comedi_init()

commit a9332e9a upstream.

There is a clean-up bug in the core comedi module initialization
functions, `comedi_init()`.  If the `comedi_num_legacy_minors` module
parameter is non-zero (and valid), it creates that many "legacy" devices
and registers them in SysFS.  A failure causes the function to clean up
and return an error.  Unfortunately, it fails to destroy the "comedi"
class that was created earlier.  Fix it by adding a call to
`class_destroy(comedi_class)` at the appropriate place in the clean-up
sequence.
Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f1fbb849
...@@ -2600,6 +2600,7 @@ static int __init comedi_init(void) ...@@ -2600,6 +2600,7 @@ static int __init comedi_init(void)
dev = comedi_alloc_board_minor(NULL); dev = comedi_alloc_board_minor(NULL);
if (IS_ERR(dev)) { if (IS_ERR(dev)) {
comedi_cleanup_board_minors(); comedi_cleanup_board_minors();
class_destroy(comedi_class);
cdev_del(&comedi_cdev); cdev_del(&comedi_cdev);
unregister_chrdev_region(MKDEV(COMEDI_MAJOR, 0), unregister_chrdev_region(MKDEV(COMEDI_MAJOR, 0),
COMEDI_NUM_MINORS); COMEDI_NUM_MINORS);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment