diff options
| author | Pekka Enberg <penberg@kernel.org> | 2012-01-11 23:11:29 +0400 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2012-01-11 23:11:29 +0400 |
| commit | 5878cf431ca7233a56819ca6970153ac0b129599 (patch) | |
| tree | e5d21d04a0b468d2dabbe3a3824f23b5537fc6a7 /drivers/net/wireless/brcm80211/brcmsmac/dma.c | |
| parent | 74ee4ef1f901fbb014bdcdc9171d126490ce2b62 (diff) | |
| parent | b13683d1cc14d1dd30b8e20f3ebea3f814ad029f (diff) | |
| download | linux-5878cf431ca7233a56819ca6970153ac0b129599.tar.xz | |
Merge branch 'slab/urgent' into slab/for-linus
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmsmac/dma.c')
| -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; |