---

yaml --- r: 168294 b: refs/heads/master c: 80f0c89 h: refs/heads/master v: v3
git-mirror · Nov 3, 2009 · b3f304b · b3f304b
1 parent a464594
commit b3f304b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58ce48a9de1dd47acb5dc00e2837214d2be1d92a
+refs/heads/master: 80f0c895b57f0d936b420de6afea5167a49f62fa
diff --git a/trunk/drivers/platform/x86/eeepc-laptop.c b/trunk/drivers/platform/x86/eeepc-laptop.c
@@ -356,7 +356,8 @@ static void __devinit eeepc_enable_camera(void)
 	 * If the following call to set_acpi() fails, it's because there's no
 	 * camera so we can ignore the error.
 	 */
-	set_acpi(CM_ASL_CAMERA, 1);
+	if (get_acpi(CM_ASL_CAMERA) == 0)
+		set_acpi(CM_ASL_CAMERA, 1);
 }
 
 /*