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:17:58 +0100 |
| commit | 7cb8663544d85bd2c401f6e3a0bc651c3ef67b9f (patch) | |
| tree | 3c7d2dd6579c0bcc79caba3707187385922feda2 /drivers | |
| parent | 20fdf274472998123a8d173ba4cb6282ff6b63bd (diff) | |
| download | linux-stable-7cb8663544d85bd2c401f6e3a0bc651c3ef67b9f.tar.gz linux-stable-7cb8663544d85bd2c401f6e3a0bc651c3ef67b9f.tar.bz2 linux-stable-7cb8663544d85bd2c401f6e3a0bc651c3ef67b9f.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')
| -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 c7c9e95e58a8..123b870728fb 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 |