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>
This commit is contained in:
parent
45e7798886
commit
176f9c1804
|
@ -758,8 +758,7 @@ static int __init acpi_bus_init(void)
|
||||||
acpi_status status = AE_OK;
|
acpi_status status = AE_OK;
|
||||||
extern acpi_status acpi_os_initialize1(void);
|
extern acpi_status acpi_os_initialize1(void);
|
||||||
|
|
||||||
|
acpi_os_initialize1();
|
||||||
status = acpi_os_initialize1();
|
|
||||||
|
|
||||||
status =
|
status =
|
||||||
acpi_enable_subsystem(ACPI_NO_HARDWARE_INIT | ACPI_NO_ACPI_ENABLE);
|
acpi_enable_subsystem(ACPI_NO_HARDWARE_INIT | ACPI_NO_ACPI_ENABLE);
|
||||||
|
@ -769,12 +768,6 @@ static int __init acpi_bus_init(void)
|
||||||
goto error1;
|
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
|
* 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()
|
* the EC device is found in the namespace (i.e. before acpi_initialize_objects()
|
||||||
|
|
Loading…
Reference in New Issue