---

yaml --- r: 300011 b: refs/heads/master c: addde4e h: refs/heads/master i: 300009: 72919bd 300007: ee59b0c v: v3
git-mirror · May 3, 2012 · 3621496 · 3621496
1 parent 0aac262
commit 3621496
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e6586240a66e38dff2fbefd89451cfcdd68dceac
+refs/heads/master: addde4ec31456c5f1e9b61aae3edcfeb0f338f87
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_acpi.c b/trunk/drivers/gpu/drm/nouveau/nouveau_acpi.c
@@ -270,7 +270,7 @@ static bool nouveau_dsm_detect(void)
 	struct acpi_buffer buffer = {sizeof(acpi_method_name), acpi_method_name};
 	struct pci_dev *pdev = NULL;
 	int has_dsm = 0;
-	int has_optimus;
+	int has_optimus = 0;
 	int vga_count = 0;
 	bool guid_valid;
 	int retval;