---

yaml --- r: 222107 b: refs/heads/master c: 108409a h: refs/heads/master i: 222105: c857c69 222103: a62f67e v: v3
git-mirror · Nov 10, 2010 · 95b8eab · 95b8eab
1 parent 2159781
commit 95b8eab
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 32ed3036c56284a720c0c00d92ee14bf609f497d
+refs/heads/master: 108409a8a4e325db38f27258da68d7207a0ad433
diff --git a/trunk/drivers/video/omap2/vram.c b/trunk/drivers/video/omap2/vram.c
@@ -554,9 +554,15 @@ void __init omap_vram_reserve_sdram_memblock(void)
 	size = PAGE_ALIGN(size);
 
 	if (paddr) {
-		if ((paddr & ~PAGE_MASK) ||
-		    !memblock_is_region_memory(paddr, size)) {
-			pr_err("Illegal SDRAM region for VRAM\n");
+		if (paddr & ~PAGE_MASK) {
+			pr_err("VRAM start address 0x%08x not page aligned\n",
+					paddr);
+			return;
+		}
+
+		if (!memblock_is_region_memory(paddr, size)) {
+			pr_err("Illegal SDRAM region 0x%08x..0x%08x for VRAM\n",
+					paddr, paddr + size - 1);
 			return;
 		}