diff options
| author | Andi Kleen <ak@linux.intel.com> | 2008-08-21 08:46:25 +0200 |
|---|---|---|
| committer | Andi Kleen <ak@linux.intel.com> | 2008-08-21 08:46:25 +0200 |
| commit | f54538c3a01004a783b13f294ca39cffdc0bc0e1 (patch) | |
| tree | cbaee43aac659dddc833f0ad2699d74e396c6181 | |
| parent | f3853863b03519a18e1e38f55089544870d4b79c (diff) | |
| parent | f0df2d6b52ad7db5edf56909509d51be66fe90be (diff) | |
Merge branch 'acpica-release-fixes' into release-2.6.27
| -rw-r--r-- | drivers/acpi/dispatcher/dsobject.c | 2 | ||||
| -rw-r--r-- | drivers/acpi/tables.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/acpi/dispatcher/dsobject.c b/drivers/acpi/dispatcher/dsobject.c index 1022e38994c..0f280589921 100644 --- a/drivers/acpi/dispatcher/dsobject.c +++ b/drivers/acpi/dispatcher/dsobject.c @@ -496,7 +496,7 @@ acpi_ds_build_internal_package_obj(struct acpi_walk_state *walk_state, arg = arg->common.next; } - ACPI_ERROR((AE_INFO, + ACPI_WARNING((AE_INFO, "Package List length (%X) larger than NumElements count (%X), truncated\n", i, element_count)); } else if (i < element_count) { diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c index c3419182c9a..775c97a282b 100644 --- a/drivers/acpi/tables.c +++ b/drivers/acpi/tables.c @@ -300,6 +300,8 @@ int __init acpi_table_init(void) static int __init acpi_parse_apic_instance(char *str) { + if (!str) + return -EINVAL; acpi_apic_instance = simple_strtoul(str, NULL, 0); |