Merge branch 'bugzilla-10237' into test (63e065e5) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/acpi/ec.c

+13 −2

Original line number	Original line	Diff line number	Diff line
	@@ -862,9 +862,20 @@ static int ec_install_handlers(struct acpi_ec *ec)
	&acpi_ec_space_handler,		&acpi_ec_space_handler,
	NULL, ec);		NULL, ec);
	if (ACPI_FAILURE(status)) {		if (ACPI_FAILURE(status)) {
	acpi_remove_gpe_handler(NULL, ec->gpe, &acpi_ec_gpe_handler);		if (status == AE_NOT_FOUND) {
			/*
			* Maybe OS fails in evaluating the _REG object.
			* The AE_NOT_FOUND error will be ignored and OS
			* continue to initialize EC.
			*/
			printk(KERN_ERR "Fail in evaluating the _REG object"
			" of EC device. Broken bios is suspected.\n");
			} else {
			acpi_remove_gpe_handler(NULL, ec->gpe,
			&acpi_ec_gpe_handler);
	return -ENODEV;		return -ENODEV;
	}		}
			}

	ec->handlers_installed = 1;		ec->handlers_installed = 1;
	return 0;		return 0;