diff options
| author | Len Brown | 2006-06-16 03:31:17 +0200 |
|---|---|---|
| committer | Len Brown | 2006-06-16 03:31:17 +0200 |
| commit | bf891bd65de65284f3964216fcde493dba5149db (patch) | |
| tree | 082056dd77fa9599034424c46ef8a67f93565e89 /drivers/acpi | |
| parent | Pull video into release branch (diff) | |
| parent | ACPI add ia64 exports to build acpi_memhotplug as a module (diff) | |
| download | kernel-qcow2-linux-bf891bd65de65284f3964216fcde493dba5149db.tar.gz kernel-qcow2-linux-bf891bd65de65284f3964216fcde493dba5149db.tar.xz kernel-qcow2-linux-bf891bd65de65284f3964216fcde493dba5149db.zip | |
Pull trivial2 into release branch
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/asus_acpi.c | 2 | ||||
| -rw-r--r-- | drivers/acpi/processor_idle.c | 8 | ||||
| -rw-r--r-- | drivers/acpi/thermal.c | 2 | ||||
| -rw-r--r-- | drivers/acpi/utils.c | 2 |
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) if (!asus_hotk_found) { acpi_bus_unregister_driver(&asus_hotk_driver); remove_proc_entry(PROC_ASUS, acpi_root_dir); - return -ENODEV; + return result; } 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") #define US_TO_PM_TIMER_TICKS(t) ((t * (PM_TIMER_FREQUENCY/1000)) / 1000) #define C2_OVERHEAD 4 /* 1us (3.579 ticks per us) */ #define C3_OVERHEAD 4 /* 1us (3.579 ticks per us) */ -static void (*pm_idle_save) (void); +static void (*pm_idle_save) (void) __read_mostly; module_param(max_cstate, uint, 0644); -static unsigned int nocst = 0; +static unsigned int nocst __read_mostly; module_param(nocst, uint, 0000); /* @@ -67,7 +67,7 @@ module_param(nocst, uint, 0000); * 100 HZ: 0x0000000F: 4 jiffies = 40ms * reduce history for more aggressive entry into C3 */ -static unsigned int bm_history = +static unsigned int bm_history __read_mostly = (HZ >= 800 ? 0xFFFFFFFF : ((1U << (HZ / 25)) - 1)); module_param(bm_history, uint, 0644); /* -------------------------------------------------------------------------- @@ -1081,7 +1081,7 @@ int acpi_processor_power_init(struct acpi_processor *pr, struct acpi_device *device) { acpi_status status = 0; - static int first_run = 0; + static int first_run; struct proc_dir_entry *entry = NULL; unsigned int i; 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) result = acpi_thermal_add_fs(device); if (result) - return_VALUE(result); + goto end; init_timer(&tz->timer); 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, status = acpi_evaluate_object(handle, pathname, arguments, &buffer); if (ACPI_FAILURE(status)) { acpi_util_eval_error(handle, pathname, status); + kfree(element); return_ACPI_STATUS(status); } if (element->type != ACPI_TYPE_INTEGER) { acpi_util_eval_error(handle, pathname, AE_BAD_DATA); + kfree(element); return_ACPI_STATUS(AE_BAD_DATA); } |