| From dbd3e6eaf3d813939b28e8a66e29d81cdc836445 Mon Sep 17 00:00:00 2001 |
| From: Armin Wolf <W_Armin@gmx.de> |
| Date: Fri, 12 Nov 2021 18:14:40 +0100 |
| Subject: hwmon: (dell-smm) Fix warning on /proc/i8k creation error |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| 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 |