From 6a47f9f10efbf6e0e801d76554d504bc86c78574 Mon Sep 17 00:00:00 2001 From: Roland Vossen Date: Tue, 23 Aug 2011 14:13:59 +0200 Subject: [PATCH] --- yaml --- r: 267505 b: refs/heads/master c: c13d2ad0599a73d87871c5a2b4468e8cbd4bf369 h: refs/heads/master i: 267503: ee4fe0b0055986ab5bcbb210dab9754722a54b72 v: v3 --- [refs] | 2 +- trunk/drivers/staging/brcm80211/brcmsmac/dma.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4ba0207966eb..4687edfa9dc9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 49d468f64d59016030c2835a423833e7b45ccce5 +refs/heads/master: c13d2ad0599a73d87871c5a2b4468e8cbd4bf369 diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/dma.c b/trunk/drivers/staging/brcm80211/brcmsmac/dma.c index 2ef416a9558e..05dad9fcc931 100644 --- a/trunk/drivers/staging/brcm80211/brcmsmac/dma.c +++ b/trunk/drivers/staging/brcm80211/brcmsmac/dma.c @@ -600,13 +600,18 @@ static bool _dma_alloc(struct dma_info *di, uint direction) void *dma_alloc_consistent(struct pci_dev *pdev, uint size, u16 align_bits, uint *alloced, unsigned long *pap) { + void *rc; + dma_addr_t dma_addr; + if (align_bits) { u16 align = (1 << align_bits); if (!IS_ALIGNED(PAGE_SIZE, align)) size += align; *alloced = size; } - return pci_alloc_consistent(pdev, size, (dma_addr_t *) pap); + rc = pci_alloc_consistent(pdev, size, &dma_addr); + *pap = dma_addr; + return rc; } /* !! may be called with core in reset */