summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Cooper <jason@lakedaemon.net>2010-09-30 15:15:33 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-10-05 09:22:24 -0700
commitb229fad289ad36a5875c7e4f9a8e736b27d8bef4 (patch)
treebdb369a82f13474bfdbb21143450b433e3abc88c
parent2116b7a473bf1c8d26998b477c294e7fe294921f (diff)
staging: brcm80211: fix checkpatch error 'assignment in if condition'
Signed-off-by: Jason Cooper <jason@lakedaemon.net> Acked-by: Henry Ptasinski <henryp@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/brcm80211/brcmfmac/dhd_common.c10
-rw-r--r--drivers/staging/keucr/Module.symvers0
2 files changed, 6 insertions, 4 deletions
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
--- a/drivers/staging/keucr/Module.symvers
+++ /dev/null