---

yaml --- r: 298511 b: refs/heads/master c: ea71f98 h: refs/heads/master i: 298509: 0591756 298507: 8625853 298503: d06271a 298495: 68b29a1 v: v3
git-mirror · Apr 2, 2012 · 5828125 · 5828125
1 parent 5d354f0
commit 5828125
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40c61046ee3007d73f141e96aa2f3dd56ee321c6
+refs/heads/master: ea71f98d680c9ac768a7849d26d7ce4744064510
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_bios.c b/trunk/drivers/gpu/drm/nouveau/nouveau_bios.c
@@ -177,14 +177,15 @@ bios_shadow_pci(struct nvbios *bios)
 
 	if (!pci_enable_rom(pdev)) {
 		void __iomem *rom = pci_map_rom(pdev, &length);
-		if (rom) {
+		if (rom && length) {
 			bios->data = kmalloc(length, GFP_KERNEL);
 			if (bios->data) {
 				memcpy_fromio(bios->data, rom, length);
 				bios->length = length;
 			}
-			pci_unmap_rom(pdev, rom);
 		}
+		if (rom)
+			pci_unmap_rom(pdev, rom);
 
 		pci_disable_rom(pdev);
 	}