From 009fd4f950597526f5cbe0adaffd3a1145cdd0cf Mon Sep 17 00:00:00 2001
From: Silviu-Mihai Popescu <silviupopescu1990@gmail.com>
Date: Mon, 18 Mar 2013 15:06:20 -0300
Subject: [PATCH] --- yaml --- r: 366750 b: refs/heads/master c:
 69aa6f4ec669b9121057cc9e32cb10b5f744f6d6 h: refs/heads/master v: v3

---
 [refs]                                                   | 2 +-
 trunk/drivers/staging/media/davinci_vpfe/dm365_ipipe.c   | 2 +-
 trunk/drivers/staging/media/davinci_vpfe/dm365_isif.c    | 4 ++--
 trunk/drivers/staging/media/davinci_vpfe/dm365_resizer.c | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 550a6a9acf30..0781086f836d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0757f5c503a8b2eebc67c6bb8e3b88077d73049a
+refs/heads/master: 69aa6f4ec669b9121057cc9e32cb10b5f744f6d6
diff --git a/trunk/drivers/staging/media/davinci_vpfe/dm365_ipipe.c b/trunk/drivers/staging/media/davinci_vpfe/dm365_ipipe.c
index 92853539cc0a..05673ed45ce4 100644
--- a/trunk/drivers/staging/media/davinci_vpfe/dm365_ipipe.c
+++ b/trunk/drivers/staging/media/davinci_vpfe/dm365_ipipe.c
@@ -1859,5 +1859,5 @@ void vpfe_ipipe_cleanup(struct vpfe_ipipe_device *ipipe,
 	iounmap(ipipe->isp5_base_addr);
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 4);
 	if (res)
-		release_mem_region(res->start, res->end - res->start + 1);
+		release_mem_region(res->start, resource_size(res));
 }
diff --git a/trunk/drivers/staging/media/davinci_vpfe/dm365_isif.c b/trunk/drivers/staging/media/davinci_vpfe/dm365_isif.c
index ebeea72e176a..c4a566086856 100644
--- a/trunk/drivers/staging/media/davinci_vpfe/dm365_isif.c
+++ b/trunk/drivers/staging/media/davinci_vpfe/dm365_isif.c
@@ -1953,7 +1953,7 @@ static void isif_remove(struct vpfe_isif_device *isif,
 		res = platform_get_resource(pdev, IORESOURCE_MEM, i);
 		if (res)
 			release_mem_region(res->start,
-					   res->end - res->start + 1);
+					   resource_size(res));
 		i++;
 	}
 }
@@ -2003,7 +2003,7 @@ int vpfe_isif_init(struct vpfe_isif_device *isif, struct platform_device *pdev)
 			status = -ENOENT;
 			goto fail_nobase_res;
 		}
-		res_len = res->end - res->start + 1;
+		res_len = resource_size(res);
 		res = request_mem_region(res->start, res_len, res->name);
 		if (!res) {
 			status = -EBUSY;
diff --git a/trunk/drivers/staging/media/davinci_vpfe/dm365_resizer.c b/trunk/drivers/staging/media/davinci_vpfe/dm365_resizer.c
index 9cb0262b9b33..126f84c4cb64 100644
--- a/trunk/drivers/staging/media/davinci_vpfe/dm365_resizer.c
+++ b/trunk/drivers/staging/media/davinci_vpfe/dm365_resizer.c
@@ -1995,5 +1995,5 @@ vpfe_resizer_cleanup(struct vpfe_resizer_device *vpfe_rsz,
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 5);
 	if (res)
 		release_mem_region(res->start,
-					res->end - res->start + 1);
+					resource_size(res));
 }