From: Len Brown <len.brown@intel.com>
Date: Thu, 23 Oct 2008 03:27:59 +0000 (-0400)
Subject: Merge branch 'ec' into test
X-Git-Tag: v2.6.28-rc1~26^2~19
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0fbb3726f246aadd1bebc01114100b6e69afa5b9;p=linux-2.6-omap-h63xx.git

Merge branch 'ec' into test
---

0fbb3726f246aadd1bebc01114100b6e69afa5b9
diff --cc drivers/acpi/ec.c
index 4c004286b3d,444cd9ed12c..4178d17aa0e
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@@ -862,22 -871,11 +871,22 @@@ static int ec_install_handlers(struct a
  						    &acpi_ec_space_handler,
  						    NULL, ec);
  	if (ACPI_FAILURE(status)) {
 -		acpi_remove_gpe_handler(NULL, ec->gpe, &acpi_ec_gpe_handler);
 -		return -ENODEV;
 +		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;
 +		}
  	}
  
- 	ec->handlers_installed = 1;
+ 	set_bit(EC_FLAGS_HANDLERS_INSTALLED, &ec->flags);
  	return 0;
  }