From b2d0b9fd4acb6eda6eeb0b64bd28ba9a07826a37 Mon Sep 17 00:00:00 2001
From: Arend van Spriel <arend@broadcom.com>
Date: Sat, 29 Oct 2011 11:30:15 +0200
Subject: [PATCH] --- yaml --- r: 275670 b: refs/heads/master c:
 ae8e46723f803057daff392bdc93332be2f0ec98 h: refs/heads/master v: v3

---
 [refs]                                              | 2 +-
 trunk/drivers/net/wireless/brcm80211/brcmsmac/dma.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4144bd877b21..cbc791397c4f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 73d51f38c736ae286372e90056a7f31519f555ac
+refs/heads/master: ae8e46723f803057daff392bdc93332be2f0ec98
diff --git a/trunk/drivers/net/wireless/brcm80211/brcmsmac/dma.c b/trunk/drivers/net/wireless/brcm80211/brcmsmac/dma.c
index b56a30297c26..6ebec8f42846 100644
--- a/trunk/drivers/net/wireless/brcm80211/brcmsmac/dma.c
+++ b/trunk/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;