git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
brcm80211
/
brcmsmac
/
dma.c
diff --git
a/drivers/net/wireless/brcm80211/brcmsmac/dma.c
b/drivers/net/wireless/brcm80211/brcmsmac/dma.c
index
b56a302
..
6ebec8f
100644
(file)
--- 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)
{
static uint _dma_ctrlflags(struct dma_info *di, uint mask, uint flags)
{
- uint dmactrlflags
= di->dma.dmactrlflags
;
+ uint dmactrlflags;
if (di == NULL) {
if (di == NULL) {
- DMA_ERROR(("
%s: _dma_ctrlflags: NULL dma handle\n", di->name
));
+ DMA_ERROR(("
_dma_ctrlflags: NULL dma handle\n"
));
return 0;
}
return 0;
}
+ dmactrlflags = di->dma.dmactrlflags;
dmactrlflags &= ~mask;
dmactrlflags |= flags;
dmactrlflags &= ~mask;
dmactrlflags |= flags;