Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 228042
b: refs/heads/master
c: 5bf6859
h: refs/heads/master
v: v3
  • Loading branch information
Ben Collins committed Nov 8, 2010
1 parent ee0e89f commit 7f8f11b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 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: 0e4de059d90c96930ab237e7d4fbb7e3814afcb6
refs/heads/master: 5bf68592e72eb0ded154efaaf43b39aab6964fc3
5 changes: 4 additions & 1 deletion trunk/drivers/staging/solo6x10/solo6010-p2m.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,16 @@ int solo_p2m_dma_t(struct solo6010_dev *solo_dev, u8 id, int wr,
dma_addr_t dma_addr, u32 ext_addr, u32 size)
{
struct p2m_desc *desc = kzalloc(sizeof(*desc) * 2, GFP_DMA);
int ret;

if (desc == NULL)
return -ENOMEM;

solo_p2m_push_desc(&desc[1], wr, dma_addr, ext_addr, size, 0, 0);
ret = solo_p2m_dma_desc(solo_dev, id, desc, 2);
kfree(desc);

return solo_p2m_dma_desc(solo_dev, id, desc, 2);
return ret;
}

void solo_p2m_push_desc(struct p2m_desc *desc, int wr, dma_addr_t dma_addr,
Expand Down

0 comments on commit 7f8f11b

Please sign in to comment.