From 95b7f62362935d3d03c119c4dce8b66e9d7a87f5 Mon Sep 17 00:00:00 2001
From: Thomas Meyer <thomas@m3y3r.de>
Date: Sat, 6 Aug 2011 04:48:32 -0300
Subject: [PATCH] --- yaml --- r: 271852 b: refs/heads/master c:
 fbc09d3aa1510552e36d9bae05def25d039a98f2 h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/media/video/davinci/vpbe_osd.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3776cee28f18..8922dff5ba82 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 096b703fb6cc9c9e4a188b80932c467b96985fcf
+refs/heads/master: fbc09d3aa1510552e36d9bae05def25d039a98f2
diff --git a/trunk/drivers/media/video/davinci/vpbe_osd.c b/trunk/drivers/media/video/davinci/vpbe_osd.c
index 5352884998f5..ceccf4302518 100644
--- a/trunk/drivers/media/video/davinci/vpbe_osd.c
+++ b/trunk/drivers/media/video/davinci/vpbe_osd.c
@@ -1162,7 +1162,7 @@ static int osd_probe(struct platform_device *pdev)
 		goto free_mem;
 	}
 	osd->osd_base_phys = res->start;
-	osd->osd_size = res->end - res->start + 1;
+	osd->osd_size = resource_size(res);
 	if (!request_mem_region(osd->osd_base_phys, osd->osd_size,
 				MODULE_NAME)) {
 		dev_err(osd->dev, "Unable to reserve OSD MMIO region\n");