xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hwmon: (dell-smm) Fix warning on /proc/i8k creation error

Browse Source 
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: 039ae58503 ("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>
This commit is contained in:
Armin Wolf
2021-11-12 18:14:40 +01:00
committed by Greg Kroah-Hartman
parent c31470a30c
commit 6992d8c215
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/hwmon/dell-smm-hwmon.c
View File

@@ -603,14 +603,17 @@ static const struct proc_ops i8k_proc_ops = {
.proc_ioctl = i8k_ioctl, .proc_ioctl = i8k_ioctl,
}; };
static struct proc_dir_entry *entry;
static void __init i8k_init_procfs(void) static void __init i8k_init_procfs(void)
{ {
/* Register the proc entry */ /* Register the proc entry */
proc_create("i8k", 0, NULL, &i8k_proc_ops); entry = proc_create("i8k", 0, NULL, &i8k_proc_ops);
} }
static void __exit i8k_exit_procfs(void) static void __exit i8k_exit_procfs(void)
{ {
if (entry)
remove_proc_entry("i8k", NULL); remove_proc_entry("i8k", NULL);
} }