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.infradead.org/users/linville/wireless into for...
[pandora-kernel.git]
/
drivers
/
dma
/
at_hdmac.c
diff --git
a/drivers/dma/at_hdmac.c
b/drivers/dma/at_hdmac.c
index
36144f8
..
6a483ea
100644
(file)
--- a/
drivers/dma/at_hdmac.c
+++ b/
drivers/dma/at_hdmac.c
@@
-1216,7
+1216,7
@@
static int __init at_dma_probe(struct platform_device *pdev)
atdma->dma_common.cap_mask = pdata->cap_mask;
atdma->all_chan_mask = (1 << pdata->nr_channels) - 1;
atdma->dma_common.cap_mask = pdata->cap_mask;
atdma->all_chan_mask = (1 << pdata->nr_channels) - 1;
- size =
io->end - io->start + 1
;
+ size =
resource_size(io)
;
if (!request_mem_region(io->start, size, pdev->dev.driver->name)) {
err = -EBUSY;
goto err_kfree;
if (!request_mem_region(io->start, size, pdev->dev.driver->name)) {
err = -EBUSY;
goto err_kfree;
@@
-1362,7
+1362,7
@@
static int __exit at_dma_remove(struct platform_device *pdev)
atdma->regs = NULL;
io = platform_get_resource(pdev, IORESOURCE_MEM, 0);
atdma->regs = NULL;
io = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- release_mem_region(io->start,
io->end - io->start + 1
);
+ release_mem_region(io->start,
resource_size(io)
);
kfree(atdma);
kfree(atdma);