diff options
| author | Jiri Slaby <jirislaby@gmail.com> | 2009-03-04 20:55:27 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-03-16 05:35:30 +0100 |
| commit | 176f9c1804df09f3e9b998c0642e212592ac6283 (patch) | |
| tree | 8e2c670cce94b658cc6e0147585497119af0b527 | |
| parent | ACPI suspend: Blacklist Toshiba Satellite L300 that requires to set SCI_EN di... (diff) | |
| download | linux-176f9c1804df09f3e9b998c0642e212592ac6283.tar.xz linux-176f9c1804df09f3e9b998c0642e212592ac6283.zip | |
ACPI: remove doubled status checking
There was a misplaced status test (two consequent tests without a
statement in between) in acpi_bus_init for ages. Remove it, since the
function which should be checked (acpi_os_initialize1) has BUG_ONs on
failure paths.
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>
| -rw-r--r-- | drivers/acpi/bus.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 765fd1c56cd6..bee64b73c919 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -758,8 +758,7 @@ static int __init acpi_bus_init(void) acpi_status status = AE_OK; extern acpi_status acpi_os_initialize1(void); - - status = acpi_os_initialize1(); + acpi_os_initialize1(); status = acpi_enable_subsystem(ACPI_NO_HARDWARE_INIT | ACPI_NO_ACPI_ENABLE); @@ -769,12 +768,6 @@ static int __init acpi_bus_init(void) goto error1; } - if (ACPI_FAILURE(status)) { - printk(KERN_ERR PREFIX - "Unable to initialize ACPI OS objects\n"); - goto error1; - } - /* * ACPI 2.0 requires the EC driver to be loaded and work before * the EC device is found in the namespace (i.e. before acpi_initialize_objects() |