lkml.org 
[lkml]   [2017]   [Oct]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 048/192] staging: comedi: fix clean-up of comedi_class in comedi_init()
    3.16.49-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Ian Abbott <abbotti@mev.co.uk>

    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>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    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
    @@ -2626,6 +2626,7 @@ static int __init comedi_init(void)
    dev = comedi_alloc_board_minor(NULL);
    if (IS_ERR(dev)) {
    comedi_cleanup_board_minors();
    + class_destroy(comedi_class);
    cdev_del(&comedi_cdev);
    unregister_chrdev_region(MKDEV(COMEDI_MAJOR, 0),
    COMEDI_NUM_MINORS);
    \
     
     \ /
      Last update: 2017-10-09 15:27    [W:4.033 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site