1 files changed, 8 insertions, 11 deletions

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
index 8121dbabbff6..aa4f719a51a9 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
@@ -80,8 +80,10 @@ brcmf_c_mkiovar(char *name, char *data, uint datalen, char *buf, uint buflen)
         strncpy(buf, name, buflen);
 
         /* append data onto the end of the name string */
-        memcpy(&buf[len], data, datalen);
-        len += datalen;
+        if (data && datalen) {
+                memcpy(&buf[len], data, datalen);
+                len += datalen;
+        }
 
         return len;
 }
@@ -431,13 +433,7 @@ brcmf_c_show_host_event(struct brcmf_event_msg *event, void *event_data)
         }
 
         /* show any appended data */
-        if (datalen) {
-                buf = (unsigned char *) event_data;
-                brcmf_dbg(EVENT, " data (%d) : ", datalen);
-                for (i = 0; i < datalen; i++)
-                        brcmf_dbg(EVENT, " 0x%02x ", *buf++);
-                brcmf_dbg(EVENT, "\n");
-        }
+        brcmf_dbg_hex_dump(datalen, event_data, datalen, "Received data");
 }
 #endif                          /* DEBUG */
 
@@ -528,8 +524,9 @@ brcmf_c_host_event(struct brcmf_pub *drvr, int *ifidx, void *pktdata,
         }
 
 #ifdef DEBUG
-        brcmf_c_show_host_event(event, event_data);
-#endif                          /* DEBUG */
+        if (BRCMF_EVENT_ON())
+                brcmf_c_show_host_event(event, event_data);
+#endif /* DEBUG */
 
         return 0;
 }