---

yaml --- r: 177501 b: refs/heads/master c: 4871868 h: refs/heads/master i: 177499: aa55150 v: v3
git-mirror · Dec 9, 2009 · 6b80c79 · 6b80c79
1 parent 2466a49
commit 6b80c79
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eacec3031d1f444a618cf2d023d52f088cf82a7e
+refs/heads/master: 487186880d31821eaaba0cc1f27d5a581c56981d
diff --git a/trunk/drivers/platform/x86/eeepc-laptop.c b/trunk/drivers/platform/x86/eeepc-laptop.c
@@ -935,15 +935,18 @@ static int eeepc_get_fan_ctrl(void)
 	int value = 0;
 
 	read_acpi_int(NULL, EEEPC_EC_FAN_CTRL, &value);
-	return ((value & 0x02 ? 1 : 0));
+	if (value & 0x02)
+		return 1; /* manual */
+	else
+		return 2; /* automatic */
 }
 
 static void eeepc_set_fan_ctrl(int manual)
 {
 	int value = 0;
 
 	read_acpi_int(NULL, EEEPC_EC_FAN_CTRL, &value);
-	if (manual)
+	if (manual == 1)
 		value |= 0x02;
 	else
 		value &= ~0x02;