diff options
| author | Joe Perches <joe@perches.com> | 2010-03-24 22:16:59 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-11 11:35:44 -0700 |
| commit | 6aed5295ae93fc7947ee50eb2789655b88f6c941 (patch) | |
| tree | b83a84720db7a21e631cc9ec5bd92f8fded13a77 /drivers/staging/rt2860/common/spectrum.c | |
| parent | 62fa452648d3098896bf5a8d78af4f058b355aa0 (diff) | |
Staging: rt2860: Hoist assign from if
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rt2860/common/spectrum.c')
| -rw-r--r-- | drivers/staging/rt2860/common/spectrum.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/staging/rt2860/common/spectrum.c b/drivers/staging/rt2860/common/spectrum.c index 51e38d809333..2d5f847e6cc6 100644 --- a/drivers/staging/rt2860/common/spectrum.c +++ b/drivers/staging/rt2860/common/spectrum.c @@ -1900,8 +1900,8 @@ static void PeerMeasureReportAction(struct rt_rtmp_adapter *pAd, /* if (pAd->CommonCfg.bIEEE80211H != TRUE) */ /* return; */ - if ((pMeasureReportInfo = - kmalloc(sizeof(struct rt_measure_rpi_report), GFP_ATOMIC)) == NULL) { + pMeasureReportInfo = kmalloc(sizeof(struct rt_measure_rpi_report), GFP_ATOMIC); + if (pMeasureReportInfo == NULL) { DBGPRINT(RT_DEBUG_ERROR, ("%s unable to alloc memory for measure report buffer (size=%zu).\n", __func__, sizeof(struct rt_measure_rpi_report))); @@ -2016,7 +2016,8 @@ static void PeerTpcRepAction(struct rt_rtmp_adapter *pAd, struct rt_mlme_queue_e NdisZeroMemory(&TpcRepInfo, sizeof(struct rt_tpc_report_info)); if (PeerTpcRepSanity (pAd, Elem->Msg, Elem->MsgLen, &DialogToken, &TpcRepInfo)) { - if ((pEntry = TpcReqLookUp(pAd, DialogToken)) != NULL) { + pEntry = TpcReqLookUp(pAd, DialogToken); + if (pEntry != NULL) { TpcReqDelete(pAd, pEntry->DialogToken); DBGPRINT(RT_DEBUG_TRACE, ("%s: DialogToken=%x, TxPwr=%d, LinkMargin=%d\n", |