diff options
| author | David S. Miller <davem@davemloft.net> | 2011-11-09 16:22:15 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-11-09 16:22:15 -0500 |
| commit | 3b971a7ceb2e39e0cab95c079c738b2052b3e02f (patch) | |
| tree | 511e1112b22220c0f866718bbfa8cbee386f9d27 /drivers/net/wireless/brcm80211/brcmsmac | |
| parent | b12f62efb8ec0b9523bdb6c2d412c07193086de9 (diff) | |
| parent | e29ec6247053ad60bd0b36f155b647364a615097 (diff) | |
| download | blackbird-op-linux-3b971a7ceb2e39e0cab95c079c738b2052b3e02f.tar.gz blackbird-op-linux-3b971a7ceb2e39e0cab95c079c738b2052b3e02f.zip | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmsmac')
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmsmac/dma.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/dma.c b/drivers/net/wireless/brcm80211/brcmsmac/dma.c index b56a30297c26..6ebec8f42846 100644 --- a/drivers/net/wireless/brcm80211/brcmsmac/dma.c +++ b/drivers/net/wireless/brcm80211/brcmsmac/dma.c @@ -358,13 +358,14 @@ static uint nrxdactive(struct dma_info *di, uint h, uint t) static uint _dma_ctrlflags(struct dma_info *di, uint mask, uint flags) { - uint dmactrlflags = di->dma.dmactrlflags; + uint dmactrlflags; if (di == NULL) { - DMA_ERROR(("%s: _dma_ctrlflags: NULL dma handle\n", di->name)); + DMA_ERROR(("_dma_ctrlflags: NULL dma handle\n")); return 0; } + dmactrlflags = di->dma.dmactrlflags; dmactrlflags &= ~mask; dmactrlflags |= flags; |
