Merge branch 'ec' into test
authorLen Brown <len.brown@intel.com>
Thu, 23 Oct 2008 03:27:59 +0000 (23:27 -0400)
committerLen Brown <len.brown@intel.com>
Thu, 23 Oct 2008 03:27:59 +0000 (23:27 -0400)
1  2 
drivers/acpi/bus.c
drivers/acpi/ec.c
drivers/acpi/scan.c
include/acpi/acpi_drivers.h

Simple merge
@@@ -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;
  }
  
Simple merge
Simple merge