Skip to content

Commit cb2bc13

Browse files
ian-abbottgregkh
authored andcommitted
staging: comedi: fix clean-up of comedi_class in comedi_init()
commit a9332e9ad09c2644c99058fcf6ae2f355e93ce74 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: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 370d06c commit cb2bc13

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

drivers/staging/comedi/comedi_fops.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2911,6 +2911,7 @@ static int __init comedi_init(void)
29112911
dev = comedi_alloc_board_minor(NULL);
29122912
if (IS_ERR(dev)) {
29132913
comedi_cleanup_board_minors();
2914+
class_destroy(comedi_class);
29142915
cdev_del(&comedi_cdev);
29152916
unregister_chrdev_region(MKDEV(COMEDI_MAJOR, 0),
29162917
COMEDI_NUM_MINORS);

0 commit comments

Comments
 (0)