diff options
| author | Armin Wolf <W_Armin@gmx.de> | 2021-11-12 18:14:40 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-12-22 09:05:14 +0100 |
| commit | a25b1198ebbcd90ea9e3989c34f7bde5cd4d4425 (patch) | |
| tree | 12be1e2895da0d8902c3b3d8f675e7f2c7c9d15c /drivers/hwmon | |
| parent | dd55f64bdf58cc61247f1ead0abba37ab4fe251e (diff) | |
| download | linux-a25b1198ebbcd90ea9e3989c34f7bde5cd4d4425.tar.gz linux-a25b1198ebbcd90ea9e3989c34f7bde5cd4d4425.tar.bz2 linux-a25b1198ebbcd90ea9e3989c34f7bde5cd4d4425.zip | |
hwmon: (dell-smm) Fix warning on /proc/i8k creation error
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>
Diffstat (limited to 'drivers/hwmon')
| -rw-r--r-- | drivers/hwmon/dell-smm-hwmon.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/hwmon/dell-smm-hwmon.c b/drivers/hwmon/dell-smm-hwmon.c index 34704b0451b4..d19ad92eede9 100644 --- a/drivers/hwmon/dell-smm-hwmon.c +++ b/drivers/hwmon/dell-smm-hwmon.c @@ -578,15 +578,18 @@ static const struct file_operations i8k_fops = { .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 |