diff --git a/[refs] b/[refs]
index 738a620cf73a..b7226999d2da 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9cd23a7191f1abc32252ba92494a910d5cc5fd02
+refs/heads/master: 4f6e1cafe25df11f4c8afe5d6a3ee051aa6d5de3
diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
index f6b862d77986..c45270a2a1d9 100644
--- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
+++ b/trunk/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;
 }