From 22dd95dbd46ad909ab6d6589c59ba0ef227fa8d0 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Wed, 5 May 2010 11:18:41 +0200 Subject: [PATCH] --- yaml --- r: 195437 b: refs/heads/master c: e07afd3fb906647d37108206075834f8c670b7e3 h: refs/heads/master i: 195435: 21446bb6ee693a693a103e5bdcc2abe61aa64bc4 v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/isp1760-if.c | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index c702da5c6389..8130878dc611 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0ba169aff9181389f30f225ad92e113eeb2290b9 +refs/heads/master: e07afd3fb906647d37108206075834f8c670b7e3 diff --git a/trunk/drivers/usb/host/isp1760-if.c b/trunk/drivers/usb/host/isp1760-if.c index 42a094605c92..8f0259eaa2c7 100644 --- a/trunk/drivers/usb/host/isp1760-if.c +++ b/trunk/drivers/usb/host/isp1760-if.c @@ -36,7 +36,7 @@ static int of_isp1760_probe(struct of_device *dev, struct resource memory; struct of_irq oirq; int virq; - u64 res_len; + resource_size_t res_len; int ret; const unsigned int *prop; unsigned int devflags = 0; @@ -45,13 +45,12 @@ static int of_isp1760_probe(struct of_device *dev, if (ret) return -ENXIO; - res = request_mem_region(memory.start, memory.end - memory.start + 1, - dev_name(&dev->dev)); + res_len = resource_size(&memory); + + res = request_mem_region(memory.start, res_len, dev_name(&dev->dev)); if (!res) return -EBUSY; - res_len = memory.end - memory.start + 1; - if (of_irq_map_one(dp, 0, &oirq)) { ret = -ENODEV; goto release_reg; @@ -92,7 +91,7 @@ static int of_isp1760_probe(struct of_device *dev, return ret; release_reg: - release_mem_region(memory.start, memory.end - memory.start + 1); + release_mem_region(memory.start, res_len); return ret; }