From 95b8eab66d8d73a831e4daa4e41cdd3f85a134df Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Wed, 10 Nov 2010 11:45:18 +0200 Subject: [PATCH] --- yaml --- r: 222107 b: refs/heads/master c: 108409a8a4e325db38f27258da68d7207a0ad433 h: refs/heads/master i: 222105: c857c6925505e48e1012501e2f32d10f64070111 222103: a62f67ee4b6cfc68e35c3a55bb215240056b754b v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/vram.c | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 04171c652084..c6a4c4f606dc 100644 --- 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 index fed2a72bc6b6..bb5ee0663e65 100644 --- 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; }