brcmsmac: Fix possible NULL pointer dereference in _dma_ctrlflags()
authorSeth Forshee <seth.forshee@canonical.com>
Thu, 29 Nov 2012 13:36:00 +0000 (07:36 -0600)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 30 Nov 2012 19:00:39 +0000 (14:00 -0500)
There's a debug message to warn if this function is passed a NULL
pointer, but in order to print the message we have to dereference the
pointer. Obviously this isn't a good idea, so remove the message.

Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/brcm80211/brcmsmac/dma.c

index 511e45775c333acdd8a94177695f5be034083c8c..1860c572b3c476a88527418725848a62f7f9e45a 100644 (file)
@@ -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;