[PATCH 4.11 5/9] staging: comedi: fix clean-up of comedi_class in comedi_init()

From: Greg Kroah-Hartman
Date: Thu Jul 13 2017 - 11:40:54 EST

4.11-stable review patch. If anyone has any objections, please let me know.


From: Ian Abbott <abbotti@xxxxxxxxx>

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

Signed-off-by: Ian Abbott <abbotti@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>

drivers/staging/comedi/comedi_fops.c | 1 +
1 file changed, 1 insertion(+)

--- a/drivers/staging/comedi/comedi_fops.c
+++ b/drivers/staging/comedi/comedi_fops.c
@@ -2901,6 +2901,7 @@ static int __init comedi_init(void)
dev = comedi_alloc_board_minor(NULL);
if (IS_ERR(dev)) {
+ class_destroy(comedi_class);
unregister_chrdev_region(MKDEV(COMEDI_MAJOR, 0),