mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-13 22:25:03 +00:00
hwmon: (dell-smm) Fix warning on /proc/i8k creation error
commitdbd3e6eaf3
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:
parent
f6f1d19114
commit
3e8e272805
1 changed files with 5 additions and 2 deletions
|
@ -588,15 +588,18 @@ static const struct file_operations i8k_fops = {
|
||||||
.unlocked_ioctl = i8k_ioctl,
|
.unlocked_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_fops);
|
entry = proc_create("i8k", 0, NULL, &i8k_fops);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void __exit i8k_exit_procfs(void)
|
static void __exit i8k_exit_procfs(void)
|
||||||
{
|
{
|
||||||
remove_proc_entry("i8k", NULL);
|
if (entry)
|
||||||
|
remove_proc_entry("i8k", NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
Loading…
Reference in a new issue