From 12f1fe4ceade893fbc87aa372a3d22aeeb9d0946 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 14 Dec 2009 18:04:49 -0500 Subject: [PATCH] --- yaml --- r: 185245 b: refs/heads/master c: 3ba37bdaef3bea9fa166eae6051949d629e7ea83 h: refs/heads/master i: 185243: 243d51dc080828a5471603a90ee84a4d52f91033 v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/atmel_usba_udc.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6f5e2f668a14..f87a61279faf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5c90e314a62f09bf4dda4ec5cf50b904540ffa34 +refs/heads/master: 3ba37bdaef3bea9fa166eae6051949d629e7ea83 diff --git a/trunk/drivers/usb/gadget/atmel_usba_udc.c b/trunk/drivers/usb/gadget/atmel_usba_udc.c index 4e970cf0e29a..976822f50c70 100644 --- a/trunk/drivers/usb/gadget/atmel_usba_udc.c +++ b/trunk/drivers/usb/gadget/atmel_usba_udc.c @@ -1914,14 +1914,14 @@ static int __init usba_udc_probe(struct platform_device *pdev) udc->vbus_pin = -ENODEV; ret = -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 I/O memory, aborting.\n"); goto err_map_regs; } dev_info(&pdev->dev, "MMIO registers at 0x%08lx mapped at %p\n", (unsigned long)regs->start, udc->regs); - udc->fifo = ioremap(fifo->start, fifo->end - fifo->start + 1); + udc->fifo = ioremap(fifo->start, resource_size(fifo)); if (!udc->fifo) { dev_err(&pdev->dev, "Unable to map FIFO, aborting.\n"); goto err_map_fifo;