git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
arch
/
arm
/
plat-pxa
/
pwm.c
diff --git
a/arch/arm/plat-pxa/pwm.c
b/arch/arm/plat-pxa/pwm.c
index
a9eabdc
..
51dc5c8
100644
(file)
--- a/
arch/arm/plat-pxa/pwm.c
+++ b/
arch/arm/plat-pxa/pwm.c
@@
-204,14
+204,14
@@
static int __devinit pwm_probe(struct platform_device *pdev)
goto err_free_clk;
}
goto err_free_clk;
}
- r = request_mem_region(r->start, r
->end - r->start + 1
, pdev->name);
+ r = request_mem_region(r->start, r
esource_size(r)
, pdev->name);
if (r == NULL) {
dev_err(&pdev->dev, "failed to request memory resource\n");
ret = -EBUSY;
goto err_free_clk;
}
if (r == NULL) {
dev_err(&pdev->dev, "failed to request memory resource\n");
ret = -EBUSY;
goto err_free_clk;
}
- pwm->mmio_base = ioremap(r->start, r
->end - r->start + 1
);
+ pwm->mmio_base = ioremap(r->start, r
esource_size(r)
);
if (pwm->mmio_base == NULL) {
dev_err(&pdev->dev, "failed to ioremap() registers\n");
ret = -ENODEV;
if (pwm->mmio_base == NULL) {
dev_err(&pdev->dev, "failed to ioremap() registers\n");
ret = -ENODEV;
@@
-241,7
+241,7
@@
static int __devinit pwm_probe(struct platform_device *pdev)
return 0;
err_free_mem:
return 0;
err_free_mem:
- release_mem_region(r->start, r
->end - r->start + 1
);
+ release_mem_region(r->start, r
esource_size(r)
);
err_free_clk:
clk_put(pwm->clk);
err_free:
err_free_clk:
clk_put(pwm->clk);
err_free:
@@
-271,7
+271,7
@@
static int __devexit pwm_remove(struct platform_device *pdev)
iounmap(pwm->mmio_base);
r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
iounmap(pwm->mmio_base);
r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- release_mem_region(r->start, r
->end - r->start + 1
);
+ release_mem_region(r->start, r
esource_size(r)
);
clk_put(pwm->clk);
kfree(pwm);
clk_put(pwm->clk);
kfree(pwm);