aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2006-06-15 21:31:17 -0400
committerLen Brown <len.brown@intel.com>2006-06-15 21:31:17 -0400
commitbf891bd65de65284f3964216fcde493dba5149db (patch)
tree082056dd77fa9599034424c46ef8a67f93565e89 /drivers/acpi
parentde59e3aa6eda7fc7cd6c717f084930f6a841b602 (diff)
parent9c576ff1bc9ab42d06457e68e39c121481138562 (diff)
Pull trivial2 into release branch
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/asus_acpi.c2
-rw-r--r--drivers/acpi/processor_idle.c8
-rw-r--r--drivers/acpi/thermal.c2
-rw-r--r--drivers/acpi/utils.c2
4 files changed, 8 insertions, 6 deletions
diff --git a/drivers/acpi/asus_acpi.c b/drivers/acpi/asus_acpi.c
index 90eb3c5a15ca..839f423d738d 100644
--- a/drivers/acpi/asus_acpi.c
+++ b/drivers/acpi/asus_acpi.c
@@ -1245,7 +1245,7 @@ static int __init asus_acpi_init(void)
1245 if (!asus_hotk_found) { 1245 if (!asus_hotk_found) {
1246 acpi_bus_unregister_driver(&asus_hotk_driver); 1246 acpi_bus_unregister_driver(&asus_hotk_driver);
1247 remove_proc_entry(PROC_ASUS, acpi_root_dir); 1247 remove_proc_entry(PROC_ASUS, acpi_root_dir);
1248 return -ENODEV; 1248 return result;
1249 } 1249 }
1250 1250
1251 return 0; 1251 return 0;
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 80fa43471f48..3b97a5eae9e8 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -54,10 +54,10 @@ ACPI_MODULE_NAME("acpi_processor")
54#define US_TO_PM_TIMER_TICKS(t) ((t * (PM_TIMER_FREQUENCY/1000)) / 1000) 54#define US_TO_PM_TIMER_TICKS(t) ((t * (PM_TIMER_FREQUENCY/1000)) / 1000)
55#define C2_OVERHEAD 4 /* 1us (3.579 ticks per us) */ 55#define C2_OVERHEAD 4 /* 1us (3.579 ticks per us) */
56#define C3_OVERHEAD 4 /* 1us (3.579 ticks per us) */ 56#define C3_OVERHEAD 4 /* 1us (3.579 ticks per us) */
57static void (*pm_idle_save) (void); 57static void (*pm_idle_save) (void) __read_mostly;
58module_param(max_cstate, uint, 0644); 58module_param(max_cstate, uint, 0644);
59 59
60static unsigned int nocst = 0; 60static unsigned int nocst __read_mostly;
61module_param(nocst, uint, 0000); 61module_param(nocst, uint, 0000);
62 62
63/* 63/*
@@ -67,7 +67,7 @@ module_param(nocst, uint, 0000);
67 * 100 HZ: 0x0000000F: 4 jiffies = 40ms 67 * 100 HZ: 0x0000000F: 4 jiffies = 40ms
68 * reduce history for more aggressive entry into C3 68 * reduce history for more aggressive entry into C3
69 */ 69 */
70static unsigned int bm_history = 70static unsigned int bm_history __read_mostly =
71 (HZ >= 800 ? 0xFFFFFFFF : ((1U << (HZ / 25)) - 1)); 71 (HZ >= 800 ? 0xFFFFFFFF : ((1U << (HZ / 25)) - 1));
72module_param(bm_history, uint, 0644); 72module_param(bm_history, uint, 0644);
73/* -------------------------------------------------------------------------- 73/* --------------------------------------------------------------------------
@@ -1081,7 +1081,7 @@ int acpi_processor_power_init(struct acpi_processor *pr,
1081 struct acpi_device *device) 1081 struct acpi_device *device)
1082{ 1082{
1083 acpi_status status = 0; 1083 acpi_status status = 0;
1084 static int first_run = 0; 1084 static int first_run;
1085 struct proc_dir_entry *entry = NULL; 1085 struct proc_dir_entry *entry = NULL;
1086 unsigned int i; 1086 unsigned int i;
1087 1087
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
index a29af58cb4cd..f003763de7bb 100644
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
@@ -1343,7 +1343,7 @@ static int acpi_thermal_add(struct acpi_device *device)
1343 1343
1344 result = acpi_thermal_add_fs(device); 1344 result = acpi_thermal_add_fs(device);
1345 if (result) 1345 if (result)
1346 return_VALUE(result); 1346 goto end;
1347 1347
1348 init_timer(&tz->timer); 1348 init_timer(&tz->timer);
1349 1349
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c
index 6458c47f7ac2..6b516852ac12 100644
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
@@ -273,11 +273,13 @@ acpi_evaluate_integer(acpi_handle handle,
273 status = acpi_evaluate_object(handle, pathname, arguments, &buffer); 273 status = acpi_evaluate_object(handle, pathname, arguments, &buffer);
274 if (ACPI_FAILURE(status)) { 274 if (ACPI_FAILURE(status)) {
275 acpi_util_eval_error(handle, pathname, status); 275 acpi_util_eval_error(handle, pathname, status);
276 kfree(element);
276 return_ACPI_STATUS(status); 277 return_ACPI_STATUS(status);
277 } 278 }
278 279
279 if (element->type != ACPI_TYPE_INTEGER) { 280 if (element->type != ACPI_TYPE_INTEGER) {
280 acpi_util_eval_error(handle, pathname, AE_BAD_DATA); 281 acpi_util_eval_error(handle, pathname, AE_BAD_DATA);
282 kfree(element);
281 return_ACPI_STATUS(AE_BAD_DATA); 283 return_ACPI_STATUS(AE_BAD_DATA);
282 } 284 }
283 285