Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 262030
b: refs/heads/master
c: 114df7d
h: refs/heads/master
v: v3
  • Loading branch information
H Hartley Sweeten authored and Vinod Koul committed Jun 6, 2011
1 parent 455d65a commit 2f78ca2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7dab35c0c01c5d960d7b551a607270adccfadb42
refs/heads/master: 114df7d66efd5c23561782f38e97c48fb30d4f5d
4 changes: 2 additions & 2 deletions trunk/drivers/dma/at_hdmac.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);

Expand Down

0 comments on commit 2f78ca2

Please sign in to comment.