3 files changed, 40 insertions, 10 deletions

diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
index 23e5a0519af5..2815df66f6f7 100644
--- a/drivers/acpi/blacklist.c
+++ b/drivers/acpi/blacklist.c
@@ -185,6 +185,12 @@ static int __init dmi_disable_osi_vista(const struct dmi_system_id *d)
         acpi_osi_setup("!Windows 2006");
         return 0;
 }
+static int __init dmi_disable_osi_win7(const struct dmi_system_id *d)
+{
+        printk(KERN_NOTICE PREFIX "DMI detected: %s\n", d->ident);
+        acpi_osi_setup("!Windows 2009");
+        return 0;
+}
 
 static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
         {
@@ -211,6 +217,14 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
                      DMI_MATCH(DMI_PRODUCT_NAME, "Sony VGN-SR290J"),
                 },
         },
+        {
+        .callback = dmi_disable_osi_win7,
+        .ident = "ASUS K50IJ",
+        .matches = {
+                     DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
+                     DMI_MATCH(DMI_PRODUCT_NAME, "K50IJ"),
+                },
+        },
 
         /*
          * BIOS invocation of _OSI(Linux) is almost always a BIOS bug.
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 0bdf24a6fd01..cf761b904e4a 100644
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
@@ -397,6 +397,7 @@ acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context)
         union acpi_object *out_obj;
         u8 uuid[16];
         u32 errors;
+        struct acpi_buffer output = {ACPI_ALLOCATE_BUFFER, NULL};
 
         if (!context)
                 return AE_ERROR;
@@ -419,16 +420,16 @@ acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context)
         in_params[3].buffer.length      = context->cap.length;
         in_params[3].buffer.pointer     = context->cap.pointer;
 
-        status = acpi_evaluate_object(handle, "_OSC", &input, &context->ret);
+        status = acpi_evaluate_object(handle, "_OSC", &input, &output);
         if (ACPI_FAILURE(status))
                 return status;
 
-        /* return buffer should have the same length as cap buffer */
-        if (context->ret.length != context->cap.length)
+        if (!output.length)
                 return AE_NULL_OBJECT;
 
-        out_obj = context->ret.pointer;
-        if (out_obj->type != ACPI_TYPE_BUFFER) {
+        out_obj = output.pointer;
+        if (out_obj->type != ACPI_TYPE_BUFFER
+                || out_obj->buffer.length != context->cap.length) {
                 acpi_print_osc_error(handle, context,
                         "_OSC evaluation returned wrong type");
                 status = AE_TYPE;
@@ -457,11 +458,20 @@ acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context)
                 goto out_kfree;
         }
 out_success:
-        return AE_OK;
+        context->ret.length = out_obj->buffer.length;
+        context->ret.pointer = kmalloc(context->ret.length, GFP_KERNEL);
+        if (!context->ret.pointer) {
+                status =  AE_NO_MEMORY;
+                goto out_kfree;
+        }
+        memcpy(context->ret.pointer, out_obj->buffer.pointer,
+                context->ret.length);
+        status =  AE_OK;
 
 out_kfree:
-        kfree(context->ret.pointer);
-        context->ret.pointer = NULL;
+        kfree(output.pointer);
+        if (status != AE_OK)
+                context->ret.pointer = NULL;
         return status;
 }
 EXPORT_SYMBOL(acpi_run_osc);
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 75b147f5c8fd..fd1801bdee66 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -916,6 +916,7 @@ static int ec_validate_ecdt(const struct dmi_system_id *id)
 /* MSI EC needs special treatment, enable it */
 static int ec_flag_msi(const struct dmi_system_id *id)
 {
+        printk(KERN_DEBUG PREFIX "Detected MSI hardware, enabling workarounds.\n");
         EC_FLAGS_MSI = 1;
         EC_FLAGS_VALIDATE_ECDT = 1;
         return 0;
@@ -928,8 +929,13 @@ static struct dmi_system_id __initdata ec_dmi_table[] = {
         DMI_MATCH(DMI_BOARD_NAME, "JFL92") }, NULL},
         {
         ec_flag_msi, "MSI hardware", {
-        DMI_MATCH(DMI_BIOS_VENDOR, "Micro-Star"),
-        DMI_MATCH(DMI_CHASSIS_VENDOR, "MICRO-Star") }, NULL},
+        DMI_MATCH(DMI_BIOS_VENDOR, "Micro-Star")}, NULL},
+        {
+        ec_flag_msi, "MSI hardware", {
+        DMI_MATCH(DMI_SYS_VENDOR, "Micro-Star")}, NULL},
+        {
+        ec_flag_msi, "MSI hardware", {
+        DMI_MATCH(DMI_CHASSIS_VENDOR, "MICRO-Star")}, NULL},
         {
         ec_validate_ecdt, "ASUS hardware", {
         DMI_MATCH(DMI_BIOS_VENDOR, "ASUS") }, NULL},