[2.6.23 regression fix] fix thinkpad_acpi without hardware

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxxxx>
---bfa7bcd2b872f2c20afa7f7260d9be7dffe92d2e diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.cindex 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 */ 

-------------------------------------------------------------------------This SF.net email is sponsored by: Splunk Inc.Still grepping through log files to find problems?  Stop.Now Search log events and configuration files using AJAX and a browser.Download your FREE copy of Splunk now >>  http://get.splunk.com/_______________________________________________ibm-acpi-devel mailing listibm-acpi-devel@xxxxxxxxxxxxxxxxxxxxxxxxxx://lists.sourceforge.net/lists/listinfo/ibm-acpi-devel

[Index of Archives]     [Linux ACPI]     [Linux Kernel]     [Linux Laptop]     [Kernel Newbies]     [Share Photos]     [Security]     [Netfilter]     [Bugtraq]     [Photo]     [Yosemite Photos]     [Yosemite Advice]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Samba]     [Device Mapper]

  Powered by Linux