diff --git a/[refs] b/[refs]
index 89845edb8dfa..9534c45f33c9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3cb91f5335cfad6d85b723a8c8cce973566221b8
+refs/heads/master: c5b057b55fb9822544995f9268de871ebac81f12
diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
index 15c5db5752d1..a081e683743b 100644
--- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
+++ b/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
@@ -106,7 +106,7 @@ brcmf_c_mkiovar_bsscfg(char *name, char *data, uint datalen,
 	namelen = (u32) strlen(name) + 1; /* lengh of iovar  name + null */
 	iolen = prefixlen + namelen + sizeof(bssidx_le) + datalen;
 
-	if (buflen < 0 || iolen > (u32)buflen) {
+	if ((u32)buflen < iolen) {
 		brcmf_dbg(ERROR, "buffer is too short\n");
 		return 0;
 	}