diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 10:28:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 10:28:56 -0800 |
| commit | 7949456b1b96924c2d9ae5aea5fa7d4c81c946ed (patch) | |
| tree | 819e64dcd686c8b53c698c164aea96a002e8b5f8 /drivers/dma/iop-adma.c | |
| parent | 60d9aa758c00f20ade0cb1951f6a934f628dd2d7 (diff) | |
| parent | 12458ea06efd7b44281e68fe59c950ec7d59c649 (diff) | |
| download | kernel_samsung_smdk4412-7949456b1b96924c2d9ae5aea5fa7d4c81c946ed.tar.gz kernel_samsung_smdk4412-7949456b1b96924c2d9ae5aea5fa7d4c81c946ed.tar.bz2 kernel_samsung_smdk4412-7949456b1b96924c2d9ae5aea5fa7d4c81c946ed.zip | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
ppc440spe-adma: adds updated ppc440spe adma driver
iop-adma.c: use resource_size()
dmaengine: clarify the meaning of the DMA_CTRL_ACK flag
sh: stylistic improvements for the DMA driver
dmaengine: fix dmatest to verify minimum transfer length and test buffer size
sh: DMA driver has to specify its alignment requirements
Add COH 901 318 DMA block driver v5
Diffstat (limited to 'drivers/dma/iop-adma.c')
| -rw-r--r-- | drivers/dma/iop-adma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma/iop-adma.c b/drivers/dma/iop-adma.c index 645ca8d54ec..ca6e6a0cb79 100644 --- a/drivers/dma/iop-adma.c +++ b/drivers/dma/iop-adma.c @@ -1470,7 +1470,7 @@ static int __devinit iop_adma_probe(struct platform_device *pdev) return -ENODEV; if (!devm_request_mem_region(&pdev->dev, res->start, - res->end - res->start, pdev->name)) + resource_size(res), pdev->name)) return -EBUSY; adev = kzalloc(sizeof(*adev), GFP_KERNEL); @@ -1542,7 +1542,7 @@ static int __devinit iop_adma_probe(struct platform_device *pdev) iop_chan->device = adev; iop_chan->mmr_base = devm_ioremap(&pdev->dev, res->start, - res->end - res->start); + resource_size(res)); if (!iop_chan->mmr_base) { ret = -ENOMEM; goto err_free_iop_chan; |