diff options
| author | Yulay Rakhmangulov <yulayr@gmail.com> | 2011-03-03 00:07:41 -0800 |
|---|---|---|
| committer | Kristoffer Ericson <kristoffer.ericson@gmail.com> | 2011-12-10 15:47:41 +0100 |
| commit | f39a0820382fcab0dea5d3b4ccbb387cc8fcd68d (patch) | |
| tree | 6d49b8403cd0a9543e8207464ef059020af2956f | |
| parent | ffc7aa8590c47a59815c23df908ff1da3028e02c (diff) | |
| download | linux-hpc-v2.6.34-hpc.tar.gz | |
ARM: Nec MobilePro900/c: Fix to isp116x-hcd driverv2.6.34-hpc
ARM: Nec MobilePro900/c: Fix to isp116x-hcd driver
Fix is to use resource length macro instead of hardcoded values.
Signed-off-by: Yulay Rakhmangulov <yulayr@gmail.com>
Signed-off-by: Kristoffer Ericson <kristoffer.ericson@gmail.com>
| -rw-r--r-- | drivers/usb/host/isp116x-hcd.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c index 92de71dc7729f..d39fd274a15fe 100644 --- a/drivers/usb/host/isp116x-hcd.c +++ b/drivers/usb/host/isp116x-hcd.c @@ -1534,6 +1534,8 @@ static struct hc_driver isp116x_hc_driver = { /*----------------------------------------------------------------*/ +#define resource_len(r) (((r)->end - (r)->start) + 1) + static int isp116x_remove(struct platform_device *pdev) { struct usb_hcd *hcd = platform_get_drvdata(pdev); @@ -1548,17 +1550,15 @@ static int isp116x_remove(struct platform_device *pdev) iounmap(isp116x->data_reg); res = platform_get_resource(pdev, IORESOURCE_MEM, 1); - release_mem_region(res->start, 2); + release_mem_region(res->start, resource_len(res)); iounmap(isp116x->addr_reg); res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - release_mem_region(res->start, 2); + release_mem_region(res->start, resource_len(res)); usb_put_hcd(hcd); return 0; } -#define resource_len(r) (((r)->end - (r)->start) + 1) - static int __devinit isp116x_probe(struct platform_device *pdev) { struct usb_hcd *hcd; @@ -1593,7 +1593,7 @@ static int __devinit isp116x_probe(struct platform_device *pdev) goto err1; } - if (!request_mem_region(addr->start, 2, hcd_name)) { + if (!request_mem_region(addr->start, resource_len(addr), hcd_name)) { ret = -EBUSY; goto err1; } @@ -1602,7 +1602,7 @@ static int __devinit isp116x_probe(struct platform_device *pdev) ret = -ENOMEM; goto err2; } - if (!request_mem_region(data->start, 2, hcd_name)) { + if (!request_mem_region(data->start, resource_len(data), hcd_name)) { ret = -EBUSY; goto err3; } @@ -1659,11 +1659,11 @@ static int __devinit isp116x_probe(struct platform_device *pdev) err5: iounmap(data_reg); err4: - release_mem_region(data->start, 2); + release_mem_region(data->start, resource_len(data)); err3: iounmap(addr_reg); err2: - release_mem_region(addr->start, 2); + release_mem_region(addr->start, resource_len(addr)); err1: ERR("init error, %d\n", ret); return ret; |