lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: brcm80211: fix checkpatch error 'assignment in if condition'

Browse Source 
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Acked-by: Henry Ptasinski <henryp@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Jason Cooper
2010-09-30 15:15:41 -04:00
committed by Greg Kroah-Hartman
parent 59334c2f1f
commit 02266551e8
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/staging/brcm80211/brcmfmac/dhd_cdc.c
View File

@@ -131,7 +131,8 @@ dhdcdc_query_ioctl(dhd_pub_t *dhd, int ifidx, uint cmd, void *buf, uint len)
if (buf) if (buf)
memcpy(prot->buf, buf, len); memcpy(prot->buf, buf, len);
if ((ret = dhdcdc_msg(dhd)) < 0) { ret = dhdcdc_msg(dhd);
if (ret < 0) {
DHD_ERROR(("dhdcdc_query_ioctl: dhdcdc_msg failed w/status " DHD_ERROR(("dhdcdc_query_ioctl: dhdcdc_msg failed w/status "
"%d\n", ret)); "%d\n", ret));
goto done; goto done;
@@ -139,7 +140,8 @@ dhdcdc_query_ioctl(dhd_pub_t *dhd, int ifidx, uint cmd, void *buf, uint len)
retry: retry:
/* wait for interrupt and get first fragment */ /* wait for interrupt and get first fragment */
if ((ret = dhdcdc_cmplt(dhd, prot->reqid, len)) < 0) ret = dhdcdc_cmplt(dhd, prot->reqid, len);
if (ret < 0)
goto done; goto done;
flags = ltoh32(msg->flags); flags = ltoh32(msg->flags);
@@ -196,10 +198,12 @@ int dhdcdc_set_ioctl(dhd_pub_t *dhd, int ifidx, uint cmd, void *buf, uint len)
if (buf) if (buf)
memcpy(prot->buf, buf, len); memcpy(prot->buf, buf, len);
if ((ret = dhdcdc_msg(dhd)) < 0) ret = dhdcdc_msg(dhd);
if (ret < 0)
goto done; goto done;
if ((ret = dhdcdc_cmplt(dhd, prot->reqid, len)) < 0) ret = dhdcdc_cmplt(dhd, prot->reqid, len);
if (ret < 0)
goto done; goto done;
flags = ltoh32(msg->flags); flags = ltoh32(msg->flags);
@@ -369,7 +373,8 @@ int dhd_prot_hdrpull(dhd_pub_t *dhd, int *ifidx, void *pktbuf)
h = (struct bdc_header *)PKTDATA(pktbuf); h = (struct bdc_header *)PKTDATA(pktbuf);
if ((*ifidx = BDC_GET_IF_IDX(h)) >= DHD_MAX_IFS) { *ifidx = BDC_GET_IF_IDX(h);
if (*ifidx >= DHD_MAX_IFS) {
DHD_ERROR(("%s: rx data ifnum out of range (%d)\n", DHD_ERROR(("%s: rx data ifnum out of range (%d)\n",
__func__, *ifidx)); __func__, *ifidx));
return BCME_ERROR; return BCME_ERROR;
@@ -402,15 +407,15 @@ int dhd_prot_attach(dhd_pub_t *dhd)
dhd_prot_t *cdc; dhd_prot_t *cdc;
#ifndef DHD_USE_STATIC_BUF #ifndef DHD_USE_STATIC_BUF
if (!(cdc = (dhd_prot_t *) MALLOC(dhd->osh, sizeof(dhd_prot_t)))) { cdc = (dhd_prot_t *) MALLOC(dhd->osh, sizeof(dhd_prot_t));
if (!cdc) {
DHD_ERROR(("%s: kmalloc failed\n", __func__)); DHD_ERROR(("%s: kmalloc failed\n", __func__));
goto fail; goto fail;
} }
#else #else
if (! cdc = (dhd_prot_t *) dhd_os_prealloc(DHD_PREALLOC_PROT,
(cdc = sizeof(dhd_prot_t));
(dhd_prot_t *) dhd_os_prealloc(DHD_PREALLOC_PROT, if (!cdc) {
sizeof(dhd_prot_t)))) {
DHD_ERROR(("%s: kmalloc failed\n", __func__)); DHD_ERROR(("%s: kmalloc failed\n", __func__));
goto fail; goto fail;
} }