diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-19 03:15:50 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-19 03:15:50 -0400 |
| commit | 5e51900be6c15488b80343d3c3e62d4d605ba9a9 (patch) | |
| tree | 99e60bbc949e066503b598893998286c8a42861d /drivers/acpi/tables.c | |
| parent | 998564789137921acae9e367b61c5a1dc295653d (diff) | |
| parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
Merge commit 'v2.6.27-rc6' into x86/cleanups
Diffstat (limited to 'drivers/acpi/tables.c')
| -rw-r--r-- | drivers/acpi/tables.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c index c3419182c9a7..775c97a282bd 100644 --- a/drivers/acpi/tables.c +++ b/drivers/acpi/tables.c | |||
| @@ -300,6 +300,8 @@ int __init acpi_table_init(void) | |||
| 300 | 300 | ||
| 301 | static int __init acpi_parse_apic_instance(char *str) | 301 | static int __init acpi_parse_apic_instance(char *str) |
| 302 | { | 302 | { |
| 303 | if (!str) | ||
| 304 | return -EINVAL; | ||
| 303 | 305 | ||
| 304 | acpi_apic_instance = simple_strtoul(str, NULL, 0); | 306 | acpi_apic_instance = simple_strtoul(str, NULL, 0); |
| 305 | 307 | ||