diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2011-07-27 19:13:21 +0400 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2011-07-27 19:13:21 +0400 |
| commit | 1ae105aa7416087f2920c35c3cd16831d0d09c9c (patch) | |
| tree | 935b2d7c2b902f77b37e38ec9108f905fb09f690 /drivers/dma/at_hdmac.c | |
| parent | 02f8c6aee8df3cdc935e9bdd4f2d020306035dbe (diff) | |
| parent | 5a42fb93e6a33224774786691027ef2d9795c245 (diff) | |
| download | linux-1ae105aa7416087f2920c35c3cd16831d0d09c9c.tar.xz | |
Merge branch 'next' into for-linus-3.0
Diffstat (limited to 'drivers/dma/at_hdmac.c')
| -rw-r--r-- | drivers/dma/at_hdmac.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c index 36144f88d718..6a483eac7b3f 100644 --- 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; - 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; @@ -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); - release_mem_region(io->start, io->end - io->start + 1); + release_mem_region(io->start, resource_size(io)); kfree(atdma); |