From 7f8f11be191a3ca42a436c0480197eb21b6ce65e Mon Sep 17 00:00:00 2001 From: Ben Collins Date: Mon, 8 Nov 2010 10:07:42 -0500 Subject: [PATCH] --- yaml --- r: 228042 b: refs/heads/master c: 5bf68592e72eb0ded154efaaf43b39aab6964fc3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/solo6x10/solo6010-p2m.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ae9744078e20..a8cb627f214f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0e4de059d90c96930ab237e7d4fbb7e3814afcb6 +refs/heads/master: 5bf68592e72eb0ded154efaaf43b39aab6964fc3 diff --git a/trunk/drivers/staging/solo6x10/solo6010-p2m.c b/trunk/drivers/staging/solo6x10/solo6010-p2m.c index 9f2418093af5..c91fc4652a00 100644 --- a/trunk/drivers/staging/solo6x10/solo6010-p2m.c +++ b/trunk/drivers/staging/solo6x10/solo6010-p2m.c @@ -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,