---

yaml
---
r: 220031
b: refs/heads/master
c: b229fad
h: refs/heads/master
i:
  220029: eff24d6
  220027: d5e62b6
  220023: a471d98
  220015: e95e801
  219999: 79be604
  219967: ef151bb
  219903: 6154a6d
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2116b7a473bf1c8d26998b477c294e7fe294921f
+refs/heads/master: b229fad289ad36a5875c7e4f9a8e736b27d8bef4

trunk/drivers/staging/brcm80211/brcmfmac/dhd_common.c

@@ -209,8 +209,8 @@ dhd_doiovar(dhd_pub_t *dhd_pub, const bcm_iovar_t *vi, uint32 actionid,
 
 	DHD_TRACE(("%s: Enter\n", __func__));
 
-	if ((bcmerror =
-	     bcm_iovar_lencheck(vi, arg, len, IOV_ISSET(actionid))) != 0)
+	bcmerror = bcm_iovar_lencheck(vi, arg, len, IOV_ISSET(actionid));
+	if (bcmerror != 0)
 		goto exit;
 
 	if (plen >= (int)sizeof(int_val))
@@ -400,7 +400,8 @@ dhd_iovar_op(dhd_pub_t *dhd_pub, const char *name,
 	/* Set does NOT take qualifiers */
 	ASSERT(!set || (!params && !plen));
 
-	if ((vi = bcm_iovar_lookup(dhd_iovars, name)) == NULL) {
+	vi = bcm_iovar_lookup(dhd_iovars, name);
+	if (vi == NULL) {
 		bcmerror = BCME_UNSUPPORTED;
 		goto exit;
 	}
@@ -1006,7 +1007,8 @@ dhd_pktfilter_offload_enable(dhd_pub_t *dhd, char *arg, int enable,
 	wl_pkt_filter_enable_t enable_parm;
 	wl_pkt_filter_enable_t *pkt_filterp;
 
-	if (!(arg_save = MALLOC(dhd->osh, strlen(arg) + 1))) {
+	arg_save = MALLOC(dhd->osh, strlen(arg) + 1);
+	if (!arg_save) {
 		DHD_ERROR(("%s: kmalloc failed\n", __func__));
 		goto fail;
 	}