From: Joe Perches Date: Thu, 25 Mar 2010 05:17:02 +0000 (-0700) Subject: Staging: rtl8192e: Hoist assign from if X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=d6d42dfbdf9148dbc69c6345b6cdf9132782f7b5;p=deliverable%2Flinux.git Staging: rtl8192e: Hoist assign from if Signed-off-by: Joe Perches Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c index d1d7b0866755..b4beb2073919 100644 --- a/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c +++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c @@ -1934,7 +1934,8 @@ ieee80211_rx_auth_rq(struct ieee80211_device *ieee, struct sk_buff *skb) //IEEE80211DMESG("Rx probe"); ieee->softmac_stats.rx_auth_rq++; - if ((status = auth_rq_parse(skb, dest))!= -1){ + status = auth_rq_parse(skb, dest); + if (status != -1) { ieee80211_resp_to_auth(ieee, status, dest); } //DMESG("Dest is "MACSTR, MAC2STR(dest)); diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c index bb7e1ef28d3b..0b0506d22928 100644 --- a/drivers/staging/rtl8192e/r8192E_core.c +++ b/drivers/staging/rtl8192e/r8192E_core.c @@ -1864,13 +1864,15 @@ static short rtl8192_pci_initdescring(struct net_device *dev) /* general process for other queue */ for (i = 0; i < MAX_TX_QUEUE_COUNT; i++) { - if ((ret = rtl8192_alloc_tx_desc_ring(dev, i, priv->txringcount))) + ret = rtl8192_alloc_tx_desc_ring(dev, i, priv->txringcount); + if (ret) goto err_free_rings; } #if 0 /* specific process for hardware beacon process */ - if ((ret = rtl8192_alloc_tx_desc_ring(dev, MAX_TX_QUEUE_COUNT - 1, 2))) + ret = rtl8192_alloc_tx_desc_ring(dev, MAX_TX_QUEUE_COUNT - 1, 2); + if (ret) goto err_free_rings; #endif