From: Jason Cooper Date: Thu, 30 Sep 2010 19:15:33 +0000 (-0400) Subject: staging: brcm80211: fix checkpatch error 'assignment in if condition' X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=b229fad289ad36a5875c7e4f9a8e736b27d8bef4;p=openwrt%2Fstaging%2Fblogic.git staging: brcm80211: fix checkpatch error 'assignment in if condition' Signed-off-by: Jason Cooper Acked-by: Henry Ptasinski Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_common.c b/drivers/staging/brcm80211/brcmfmac/dhd_common.c index ff6bae77c817..13d10891606b 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_common.c +++ b/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; } diff --git a/drivers/staging/keucr/Module.symvers b/drivers/staging/keucr/Module.symvers deleted file mode 100644 index e69de29bb2d1..000000000000