Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 176f9c18 authored by Jiri Slaby's avatar Jiri Slaby Committed by Len Brown
Browse files

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: default avatarJiri Slaby <jirislaby@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 45e77988

drivers/acpi/bus.c

+1 −8
Original line number Diff line number Diff line
@@ -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()