diff --git a/[refs] b/[refs]
index 1fb915af0a6f..61fe46096e62 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b7c7237c0826417059d2e60ffe6ed43202dc087
+refs/heads/master: 30433d8141e239fe3621c882170876b9e5a2a94b
diff --git a/trunk/drivers/ide/ide_platform.c b/trunk/drivers/ide/ide_platform.c
index b579fbe88370..42965b3e30b9 100644
--- a/trunk/drivers/ide/ide_platform.c
+++ b/trunk/drivers/ide/ide_platform.c
@@ -81,14 +81,14 @@ static int __devinit plat_ide_probe(struct platform_device *pdev)
 
 	if (mmio) {
 		base = devm_ioremap(&pdev->dev,
-			res_base->start, res_base->end - res_base->start + 1);
+			res_base->start, resource_size(res_base));
 		alt_base = devm_ioremap(&pdev->dev,
-			res_alt->start, res_alt->end - res_alt->start + 1);
+			res_alt->start, resource_size(res_alt));
 	} else {
 		base = devm_ioport_map(&pdev->dev,
-			res_base->start, res_base->end - res_base->start + 1);
+			res_base->start, resource_size(res_base));
 		alt_base = devm_ioport_map(&pdev->dev,
-			res_alt->start, res_alt->end - res_alt->start + 1);
+			res_alt->start, resource_size(res_alt));
 	}
 
 	memset(&hw, 0, sizeof(hw));