aboutsummaryrefslogtreecommitdiff
path: root/drivers/acpi/tables.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-09-14 17:23:29 +0200
committerIngo Molnar <mingo@elte.hu>2008-09-14 17:23:29 +0200
commit9dfed08eb4086584205717894177a9ee930c88c4 (patch)
tree3455b242f0e85a86d836858a86bd6ffd21279e22 /drivers/acpi/tables.c
parent1cf44baad76b6f20f95ece397c6f643320aa44c9 (diff)
parentadee14b2e1557d0a8559f29681732d05a89dfc35 (diff)
Merge commit 'v2.6.27-rc6' into core/resources
Diffstat (limited to 'drivers/acpi/tables.c')
-rw-r--r--drivers/acpi/tables.c2
1 files changed, 2 insertions, 0 deletions
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);