René Treffer reported that booting a CONFIG_THINKPAD_ACPI=y kernel on a
machine without the hardware results in an Oops.
The trace is thinkpad_acpi_module_init -> thinkpad_acpi_module_exit ->
driver_remove_file -> sysfs_hash_and_remove.
The error handling if thinkpad_acpi_module_init() fails generally looks
suspicious, but this patch at least fixes the common case if no hardware
was found, and it seems in this case there isn't any cleanup
actually required.
Broken by commit d5a2f2f1d68e2da538ac28540cddd9ccc733b001.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
bfa7bcd2b872f2c20afa7f7260d9be7dffe92d2e
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
index fa80f35..c7432a7 100644
--- a/drivers/misc/thinkpad_acpi.c
+++ b/drivers/misc/thinkpad_acpi.c
@@ -4644,10 +4644,8 @@ static int __init thinkpad_acpi_module_init(void)
get_thinkpad_model_data(&thinkpad_id);
ret = probe_for_thinkpad();
- if (ret) {
- thinkpad_acpi_module_exit();
+ if (ret)
return ret;
- }
/* Driver initialization */
-
| Tarkan Erimer | Re: Dual-Licensing Linux Kernel with GPL V2 and GPL V3 |
| Jesper Krogh | Re: Linux 2.6.26-rc4 |
| Thomas Gleixner | Re: Linux 2.6.21-rc1 |
| Hugh Dickins | Re: [bug?] tg3: Failed to load firmware "tigon/tg3_tso.bin" |
git: | |
| Antonio Almeida | HTB accuracy for high speed |
| Jarek Poplawski | [PATCH] pkt_sched: Destroy gen estimators under rtnl_lock(). |
| Gerrit Renker | [PATCH 27/37] dccp: Integration of dynamic feature activation - part 2 (server side) |
| David Miller | [GIT]: Networking |
