lkml.org 
[lkml]   [2021]   [Dec]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 13/18] hwmon: (dell-smm) Fix warning on /proc/i8k creation error
    Date
    From: Armin Wolf <W_Armin@gmx.de>

    commit dbd3e6eaf3d813939b28e8a66e29d81cdc836445 upstream.

    The removal function is called regardless of whether
    /proc/i8k was created successfully or not, the later
    causing a WARN() on module removal.
    Fix that by only registering the removal function
    if /proc/i8k was created successfully.

    Tested on a Inspiron 3505.

    Fixes: 039ae58503f3 ("hwmon: Allow to compile dell-smm-hwmon driver without /proc/i8k")
    Signed-off-by: Armin Wolf <W_Armin@gmx.de>
    Acked-by: Pali Rohár <pali@kernel.org>
    Link: https://lore.kernel.org/r/20211112171440.59006-1-W_Armin@gmx.de
    Signed-off-by: Guenter Roeck <linux@roeck-us.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/hwmon/dell-smm-hwmon.c | 7 +++++--
    1 file changed, 5 insertions(+), 2 deletions(-)

    --- a/drivers/hwmon/dell-smm-hwmon.c
    +++ b/drivers/hwmon/dell-smm-hwmon.c
    @@ -588,15 +588,18 @@ static const struct file_operations i8k_
    .unlocked_ioctl = i8k_ioctl,
    };

    +static struct proc_dir_entry *entry;
    +
    static void __init i8k_init_procfs(void)
    {
    /* Register the proc entry */
    - proc_create("i8k", 0, NULL, &i8k_fops);
    + entry = proc_create("i8k", 0, NULL, &i8k_fops);
    }

    static void __exit i8k_exit_procfs(void)
    {
    - remove_proc_entry("i8k", NULL);
    + if (entry)
    + remove_proc_entry("i8k", NULL);
    }

    #else

    \
     
     \ /
      Last update: 2021-12-15 18:29    [W:4.115 / U:0.236 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site