diff --git a/[refs] b/[refs]
index f1d302a870c6..6f5e2f668a14 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1af107744253b01b4cf119a9bb3369376b01658b
+refs/heads/master: 5c90e314a62f09bf4dda4ec5cf50b904540ffa34
diff --git a/trunk/drivers/usb/gadget/pxa27x_udc.c b/trunk/drivers/usb/gadget/pxa27x_udc.c
index d4c6eec70edc..e8b4b6992a9d 100644
--- a/trunk/drivers/usb/gadget/pxa27x_udc.c
+++ b/trunk/drivers/usb/gadget/pxa27x_udc.c
@@ -2446,7 +2446,7 @@ static int __init pxa_udc_probe(struct platform_device *pdev)
 	}
 
 	retval = -ENOMEM;
-	udc->regs = ioremap(regs->start, regs->end - regs->start + 1);
+	udc->regs = ioremap(regs->start, resource_size(regs));
 	if (!udc->regs) {
 		dev_err(&pdev->dev, "Unable to map UDC I/O memory\n");
 		goto err_map;