lkml.org 
[lkml]   [2010]   [Apr]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] ACPI: fix fan module removal when ACPI_PROCFS is disabled
Date
When ACPI_PROCFS is disabled, /proc/acpi/fan/ directory is not created.
So, it should not be removed during the module removal either.

Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@holoscopio.com>
---
drivers/acpi/fan.c | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c
index acf2ab2..d92c035 100644
--- a/drivers/acpi/fan.c
+++ b/drivers/acpi/fan.c
@@ -355,12 +355,13 @@ static int __init acpi_fan_init(void)
#endif

result = acpi_bus_register_driver(&acpi_fan_driver);
- if (result < 0) {
+
+#ifdef CONFIG_ACPI_PROCFS
+ if (result < 0)
remove_proc_entry(ACPI_FAN_CLASS, acpi_root_dir);
- return -ENODEV;
- }
+#endif

- return 0;
+ return result;
}

static void __exit acpi_fan_exit(void)
@@ -368,7 +369,9 @@ static void __exit acpi_fan_exit(void)

acpi_bus_unregister_driver(&acpi_fan_driver);

+#ifdef CONFIG_ACPI_PROCFS
remove_proc_entry(ACPI_FAN_CLASS, acpi_root_dir);
+#endif

return;
}
--
1.6.6.1


\
 
 \ /
  Last update: 2010-04-27 18:31    [W:1.133 / U:0.292 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site