kernel-xen-dom0: add real patch.
--HG-- extra : convert_revision : 69fcc6936bc38e61982b2d51e1927f0852951a75
This commit is contained in:
parent
12d4294bc6
commit
8f5c2bac6f
1 changed files with 36 additions and 1 deletions
|
@ -1 +0,0 @@
|
||||||
../../kernel/patches/asus_atk0110_missing_MBIF_method_not_fatal.diff
|
|
|
@ -0,0 +1,36 @@
|
||||||
|
Patch submitted to lm-sensors@lm-sensors.org, here:
|
||||||
|
|
||||||
|
http://lists.lm-sensors.org/pipermail/lm-sensors/2010-January/027606.html
|
||||||
|
|
||||||
|
--- drivers/hwmon/asus_atk0110.c.orig 2010-01-07 00:07:45.000000000 +0100
|
||||||
|
+++ drivers/hwmon/asus_atk0110.c 2010-01-12 19:38:48.066204943 +0100
|
||||||
|
@@ -1141,12 +1141,7 @@ static int atk_add(struct acpi_device *d
|
||||||
|
buf.length = ACPI_ALLOCATE_BUFFER;
|
||||||
|
ret = acpi_evaluate_object_typed(data->atk_handle, BOARD_ID, NULL,
|
||||||
|
&buf, ACPI_TYPE_PACKAGE);
|
||||||
|
- if (ret != AE_OK) {
|
||||||
|
- dev_dbg(&device->dev, "atk: method MBIF not found\n");
|
||||||
|
- err = -ENODEV;
|
||||||
|
- goto out;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
+ if (ret == AE_OK) {
|
||||||
|
obj = buf.pointer;
|
||||||
|
if (obj->package.count >= 2 &&
|
||||||
|
obj->package.elements[1].type == ACPI_TYPE_STRING) {
|
||||||
|
@@ -1154,6 +1149,15 @@ static int atk_add(struct acpi_device *d
|
||||||
|
obj->package.elements[1].string.pointer);
|
||||||
|
}
|
||||||
|
ACPI_FREE(buf.pointer);
|
||||||
|
+ } else {
|
||||||
|
+ /*
|
||||||
|
+ * Some DSDTs do not have the MBIF method, but this should
|
||||||
|
+ * not be treated as fatal error! just mention this fact
|
||||||
|
+ * and continue.
|
||||||
|
+ */
|
||||||
|
+ dev_dbg(&device->dev,
|
||||||
|
+ "atk: method MBIF not found, continuing...\n");
|
||||||
|
+ }
|
||||||
|
|
||||||
|
/* Check for hwmon methods: first check "old" style methods; note that
|
||||||
|
* both may be present: in this case we stick to the old interface;
|
Loading…
Reference in a new issue