---

yaml --- r: 334714 b: refs/heads/master c: 90e2889 h: refs/heads/master v: v3
git-mirror · Oct 22, 2012 · 99e88b0 · 99e88b0
1 parent fe3a783
commit 99e88b0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c14575f99ddd5b8384c5b460687ceba181900d8
+refs/heads/master: 90e2889c4e24e2bde8f226402b46c66e18162860
diff --git a/trunk/drivers/gpu/drm/nouveau/core/subdev/bios/base.c b/trunk/drivers/gpu/drm/nouveau/core/subdev/bios/base.c
@@ -188,8 +188,10 @@ nouveau_bios_shadow_acpi(struct nouveau_bios *bios)
 	int ret, cnt, i;
 	u8  data[3];
 
-	if (!nouveau_acpi_rom_supported(pdev))
+	if (!nouveau_acpi_rom_supported(pdev)) {
+		bios->data = NULL;
 		return;
+	}
 
 	bios->size = 0;
 	if (nouveau_acpi_get_bios_chunk(data, 0, 3) == 3)