From 15ed11c67954a112ceff0a52f2b68865aecbcf15 Mon Sep 17 00:00:00 2001 From: Seth Forshee Date: Thu, 29 Nov 2012 07:36:00 -0600 Subject: [PATCH] --- yaml --- r: 341943 b: refs/heads/master c: 55cec505559dade9e7776de8f3d23fc3e54e091d h: refs/heads/master i: 341941: 6dad991312eeb1e087c5d4c021f7a01471b19f8c 341939: b019bbea76d67f10068d741b404fc29532bd6265 341935: ebe9b0fed21b554e41d64d331a5a5b92eca9533c v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/brcm80211/brcmsmac/dma.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 771d5c2e243f..e45a2e2e94b4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 697978383e94fff79fc72d9dbf1a03db8ac9784a +refs/heads/master: 55cec505559dade9e7776de8f3d23fc3e54e091d diff --git a/trunk/drivers/net/wireless/brcm80211/brcmsmac/dma.c b/trunk/drivers/net/wireless/brcm80211/brcmsmac/dma.c index 511e45775c33..1860c572b3c4 100644 --- a/trunk/drivers/net/wireless/brcm80211/brcmsmac/dma.c +++ b/trunk/drivers/net/wireless/brcm80211/brcmsmac/dma.c @@ -349,10 +349,8 @@ static uint _dma_ctrlflags(struct dma_info *di, uint mask, uint flags) { uint dmactrlflags; - if (di == NULL) { - brcms_dbg_dma(di->core, "NULL dma handle\n"); + if (di == NULL) return 0; - } dmactrlflags = di->dma.dmactrlflags; dmactrlflags &= ~mask;