Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 97045
b: refs/heads/master
c: eccf214
h: refs/heads/master
i:
  97043: 8a8fe2e
v: v3
  • Loading branch information
Christophe Jaillet authored and Dan Williams committed May 20, 2008
1 parent e24f903 commit 25a5628
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 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: 76b0c788e6033c514f2a75171b04c73c68d28e8d
refs/heads/master: eccf2144e1232c33a8235033ffa079b6ebf92faf
6 changes: 2 additions & 4 deletions trunk/drivers/dma/iop-adma.c
Original file line number Diff line number Diff line change
Expand Up @@ -821,10 +821,10 @@ static int __devinit iop_adma_memcpy_self_test(struct iop_adma_device *device)

dev_dbg(device->common.dev, "%s\n", __func__);

src = kzalloc(sizeof(u8) * IOP_ADMA_TEST_SIZE, GFP_KERNEL);
src = kmalloc(IOP_ADMA_TEST_SIZE, GFP_KERNEL);
if (!src)
return -ENOMEM;
dest = kzalloc(sizeof(u8) * IOP_ADMA_TEST_SIZE, GFP_KERNEL);
dest = kzalloc(IOP_ADMA_TEST_SIZE, GFP_KERNEL);
if (!dest) {
kfree(src);
return -ENOMEM;
Expand All @@ -834,8 +834,6 @@ static int __devinit iop_adma_memcpy_self_test(struct iop_adma_device *device)
for (i = 0; i < IOP_ADMA_TEST_SIZE; i++)
((u8 *) src)[i] = (u8)i;

memset(dest, 0, IOP_ADMA_TEST_SIZE);

/* Start copy, using first DMA channel */
dma_chan = container_of(device->common.channels.next,
struct dma_chan,
Expand Down

0 comments on commit 25a5628

Please sign in to comment.