Merge branch 'acpi-cleanup' into fixes (bf900afb) · Commits · e / devices / android_kernel_sony_msm8994_rework

drivers/acpi/apei/hest.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -89,7 +89,7 @@ int apei_hest_parse(apei_hest_func_t func, void *data)
		struct acpi_hest_header *hest_hdr;
		int i, rc, len;

		if (hest_disable)
		if (hest_disable \|\| !hest_tab)
		return -EINVAL;

		hest_hdr = (struct acpi_hest_header *)(hest_tab + 1);
		@@ -216,9 +216,6 @@ void __init acpi_hest_init(void)
		return;
		}

		if (acpi_disabled)
		goto err;

		status = acpi_get_table(ACPI_SIG_HEST, 0,
		(struct acpi_table_header **)&hest_tab);
		if (status == AE_NOT_FOUND)