summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhang Rui <rui.zhang@intel.com>2008-10-17 01:42:41 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-02-06 14:00:44 -0800
commit0a3e5c9d9093df1358ae3e6a5c151d172d2a871e (patch)
treecc59aed59d4441b58dedf33124997b910c15b4ea
parent9b304c0bd70f0056f86340ee6eafacefbbb6a5e8 (diff)
don't load asus-acpi if model is not supported
commit 7745384080ef70f7710530afa3e45477b126e056 upstream. asus_hotk_get_info should return -ENODEV if the model is not supported. http://bugzilla.kernel.org/show_bug.cgi?id=10389 Signed-off-by: Zhang Rui <rui.zhang@intel.com> Signed-off-by: Len Brown <len.brown@intel.com> Cc: Thomas Renninger <trenn@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/acpi/asus_acpi.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/acpi/asus_acpi.c b/drivers/acpi/asus_acpi.c
index 4434209e453e..e2ab023ef223 100644
--- a/drivers/acpi/asus_acpi.c
+++ b/drivers/acpi/asus_acpi.c
@@ -1244,6 +1244,8 @@ static int asus_hotk_get_info(void)
"default values\n", string);
printk(KERN_NOTICE
" send /proc/acpi/dsdt to the developers\n");
+ kfree(model);
+ return -ENODEV;
}
hotk->methods = &model_conf[hotk->model];
return AE_OK;