Merge branches 'bugzilla-12461' and 'bugzilla-9998' into release

diff --combined drivers/acpi/ec.c
index bf88f1803801c87f70a77df4ba416a85ba98db95,5a2d5372ea3959b377b124993ed25a174929d94c,ac9dd3b386b1ee5fd663b64da9c96d325e363b84..03107bce03ed424e843fd8ec801de224804148e7
--- 1/drivers/acpi/ec.c
--- 2/drivers/acpi/ec.c
--- 3/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@@@ -67,7 -67,7 -67,7 +67,7 @@@@ enum ec_command 
   
   #define ACPI_EC_DELAY                500     /* Wait 500ms max. during EC ops */
   #define ACPI_EC_UDELAY_GLK   1000    /* Wait 1ms max. to get global lock */
-- #define ACPI_EC_UDELAY               100     /* Wait 100us before polling EC again */
++ #define ACPI_EC_CDELAY               10      /* Wait 10us before polling EC */
   
   #define ACPI_EC_STORM_THRESHOLD 8    /* number of false interrupts
                                           per one transaction */
@@@@ -236,13 -236,13 -236,23 +236,23 @@@@ static int ec_check_sci(struct acpi_ec 
        return 0;
   }
   
++ static void ec_delay(void)
++ {
++      /* EC in MSI notebooks don't tolerate delays other than 550 usec */
++      if (EC_FLAGS_MSI)
++              udelay(ACPI_EC_DELAY);
++      else
++              /* Use shortest sleep available */
++              msleep(1);
++ }
++ 
   static int ec_poll(struct acpi_ec *ec)
   {
        unsigned long delay = jiffies + msecs_to_jiffies(ACPI_EC_DELAY);
--      udelay(ACPI_EC_UDELAY);
++      udelay(ACPI_EC_CDELAY);
        while (time_before(jiffies, delay)) {
                gpe_transaction(ec, acpi_ec_read_status(ec));
--              udelay(ACPI_EC_UDELAY);
++              ec_delay();
                if (ec_transaction_done(ec))
                        return 0;
        }
@@@@ -755,6 -755,10 -765,6 +765,10 @@@@ ec_parse_device(acpi_handle handle, u3
        unsigned long long tmp = 0;
   
        struct acpi_ec *ec = context;
+ +
+ +     /* clear addr values, ec_parse_io_ports depend on it */
+ +     ec->command_addr = ec->data_addr = 0;
+ +
        status = acpi_walk_resources(handle, METHOD_NAME__CRS,
                                     ec_parse_io_ports, ec);
        if (ACPI_FAILURE(status))
@@@@ -804,11 -808,11 -814,11 +818,11 @@@@ static int acpi_ec_add(struct acpi_devi
                ec = make_acpi_ec();
                if (!ec)
                        return -ENOMEM;
- -             if (ec_parse_device(device->handle, 0, ec, NULL) !=
- -                 AE_CTRL_TERMINATE) {
+ +     }
+ +     if (ec_parse_device(device->handle, 0, ec, NULL) !=
+ +             AE_CTRL_TERMINATE) {
                        kfree(ec);
                        return -EINVAL;
- -             }
        }
   
        ec->handle = device->handle;
@@@@ -986,12 -990,12 -996,12 +1000,12 @@@@ int __init acpi_ec_ecdt_probe(void
                boot_ec->handle = ACPI_ROOT_OBJECT;
                acpi_get_handle(ACPI_ROOT_OBJECT, ecdt_ptr->id, &boot_ec->handle);
                /* Don't trust ECDT, which comes from ASUSTek */
- -             if (!dmi_name_in_vendors("ASUS"))
+ +             if (!dmi_name_in_vendors("ASUS") && EC_FLAGS_MSI == 0)
                        goto install;
                saved_ec = kmalloc(sizeof(struct acpi_ec), GFP_KERNEL);
                if (!saved_ec)
                        return -ENOMEM;
- -             memcpy(saved_ec, boot_ec, sizeof(*saved_ec));
+ +             memcpy(saved_ec, boot_ec, sizeof(struct acpi_ec));
        /* fall through */
        }
        /* This workaround is needed only on some broken machines,
@@@@ -1069,10 -1073,13 -1079,13 +1083,10 @@@@ static struct acpi_driver acpi_ec_drive
                },
   };
   
 --static int __init acpi_ec_init(void)
 ++int __init acpi_ec_init(void)
   {
        int result = 0;
   
 --     if (acpi_disabled)
 --             return 0;
 --
        acpi_ec_dir = proc_mkdir(ACPI_EC_CLASS, acpi_root_dir);
        if (!acpi_ec_dir)
                return -ENODEV;
@@@@ -1087,6 -1094,8 -1100,8 +1101,6 @@@@
        return result;
   }
   
 --subsys_initcall(acpi_ec_init);
 --
   /* EC driver currently not unloadable */
   #if 0
   static void __exit acpi_ec_exit(void)