aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/c67x00
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/c67x00')
-rw-r--r--drivers/usb/c67x00/c67x00-drv.c9
-rw-r--r--drivers/usb/c67x00/c67x00-sched.c1
2 files changed, 6 insertions, 4 deletions
diff --git a/drivers/usb/c67x00/c67x00-drv.c b/drivers/usb/c67x00/c67x00-drv.c
index 5633bc5c8bf2..b6d49234e521 100644
--- a/drivers/usb/c67x00/c67x00-drv.c
+++ b/drivers/usb/c67x00/c67x00-drv.c
@@ -37,6 +37,7 @@
37#include <linux/device.h> 37#include <linux/device.h>
38#include <linux/io.h> 38#include <linux/io.h>
39#include <linux/list.h> 39#include <linux/list.h>
40#include <linux/slab.h>
40#include <linux/usb.h> 41#include <linux/usb.h>
41#include <linux/usb/c67x00.h> 42#include <linux/usb/c67x00.h>
42 43
@@ -137,13 +138,13 @@ static int __devinit c67x00_drv_probe(struct platform_device *pdev)
137 if (!c67x00) 138 if (!c67x00)
138 return -ENOMEM; 139 return -ENOMEM;
139 140
140 if (!request_mem_region(res->start, res->end - res->start + 1, 141 if (!request_mem_region(res->start, resource_size(res),
141 pdev->name)) { 142 pdev->name)) {
142 dev_err(&pdev->dev, "Memory region busy\n"); 143 dev_err(&pdev->dev, "Memory region busy\n");
143 ret = -EBUSY; 144 ret = -EBUSY;
144 goto request_mem_failed; 145 goto request_mem_failed;
145 } 146 }
146 c67x00->hpi.base = ioremap(res->start, res->end - res->start + 1); 147 c67x00->hpi.base = ioremap(res->start, resource_size(res));
147 if (!c67x00->hpi.base) { 148 if (!c67x00->hpi.base) {
148 dev_err(&pdev->dev, "Unable to map HPI registers\n"); 149 dev_err(&pdev->dev, "Unable to map HPI registers\n");
149 ret = -EIO; 150 ret = -EIO;
@@ -182,7 +183,7 @@ static int __devinit c67x00_drv_probe(struct platform_device *pdev)
182 request_irq_failed: 183 request_irq_failed:
183 iounmap(c67x00->hpi.base); 184 iounmap(c67x00->hpi.base);
184 map_failed: 185 map_failed:
185 release_mem_region(res->start, res->end - res->start + 1); 186 release_mem_region(res->start, resource_size(res));
186 request_mem_failed: 187 request_mem_failed:
187 kfree(c67x00); 188 kfree(c67x00);
188 189
@@ -208,7 +209,7 @@ static int __devexit c67x00_drv_remove(struct platform_device *pdev)
208 209
209 res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 210 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
210 if (res) 211 if (res)
211 release_mem_region(res->start, res->end - res->start + 1); 212 release_mem_region(res->start, resource_size(res));
212 213
213 kfree(c67x00); 214 kfree(c67x00);
214 215
diff --git a/drivers/usb/c67x00/c67x00-sched.c b/drivers/usb/c67x00/c67x00-sched.c
index 85dfe2965661..f6b3c253f3fa 100644
--- a/drivers/usb/c67x00/c67x00-sched.c
+++ b/drivers/usb/c67x00/c67x00-sched.c
@@ -22,6 +22,7 @@
22 */ 22 */
23 23
24#include <linux/kthread.h> 24#include <linux/kthread.h>
25#include <linux/slab.h>
25 26
26#include "c67x00.h" 27#include "c67x00.h"
27#include "c67x00-hcd.h" 28#include "c67x00-hcd.h"