---

yaml --- r: 271852 b: refs/heads/master c: fbc09d3 h: refs/heads/master v: v3
git-mirror · Sep 21, 2011 · 95b7f62 · 95b7f62
1 parent e5bb17c
commit 95b7f62
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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");