Signed-off-by: Jason Cooper <[email protected]>
---
drivers/staging/brcm80211/Module.symvers | 2 ++
drivers/staging/brcm80211/brcmfmac/dhd_common.c | 10 ++++++----
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/brcm80211/Module.symvers
b/drivers/staging/brcm80211/Module.symvers
index e69de29..6d17de3 100644
--- a/drivers/staging/brcm80211/Module.symvers
+++ b/drivers/staging/brcm80211/Module.symvers
@@ -0,0 +1,2 @@
+0xa382f556 bcmsdh_remove drivers/staging/brcm80211/brcmfmac/brcmfmac
EXPORT_SYMBOL
+0xbf4d6af0 bcmsdh_probe drivers/staging/brcm80211/brcmfmac/brcmfmac
EXPORT_SYMBOL
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_common.c
b/drivers/staging/brcm80211/brcmfmac/dhd_common.c
index ff6bae7..13d1089 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;
}
--
1.6.3.3
_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
