diff --git a/[refs] b/[refs]
index 704db5857695..2d2f3028e36f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b44a1ed82b4c2462d86fede459a802668b19d45
+refs/heads/master: a92d4c7d02d0af85b0edbf1d3c12b9e09bf1846d
diff --git a/trunk/drivers/power/goldfish_battery.c b/trunk/drivers/power/goldfish_battery.c
index c10f460f986f..29eba88a2963 100644
--- a/trunk/drivers/power/goldfish_battery.c
+++ b/trunk/drivers/power/goldfish_battery.c
@@ -178,7 +178,7 @@ static int goldfish_battery_probe(struct platform_device *pdev)
 		return -ENODEV;
 	}
 
-	data->reg_base = devm_ioremap(&pdev->dev, r->start, r->end - r->start + 1);
+	data->reg_base = devm_ioremap(&pdev->dev, r->start, resource_size(r));
 	if (data->reg_base == NULL) {
 		dev_err(&pdev->dev, "unable to remap MMIO\n");
 		return -ENOMEM;