4 files changed, 28 insertions, 25 deletions

diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c
index 730d085c3f87..d3a85f249e96 100644
--- a/drivers/staging/wlan-ng/hfa384x_usb.c
+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
@@ -1909,18 +1909,19 @@ int hfa384x_drvr_flashdl_enable(hfa384x_t *hw)
                 return -EINVAL;
 
         /* Retrieve the buffer loc&size and timeout */
-        if ((result = hfa384x_drvr_getconfig(hw, HFA384x_RID_DOWNLOADBUFFER,
-                                             &(hw->bufinfo),
-                                             sizeof(hw->bufinfo)))) {
+        result = hfa384x_drvr_getconfig(hw, HFA384x_RID_DOWNLOADBUFFER,
+                                        &(hw->bufinfo), sizeof(hw->bufinfo));
+        if (result)
                 return result;
-        }
+
         hw->bufinfo.page = le16_to_cpu(hw->bufinfo.page);
         hw->bufinfo.offset = le16_to_cpu(hw->bufinfo.offset);
         hw->bufinfo.len = le16_to_cpu(hw->bufinfo.len);
-        if ((result = hfa384x_drvr_getconfig16(hw, HFA384x_RID_MAXLOADTIME,
-                                               &(hw->dltimeout)))) {
+        result = hfa384x_drvr_getconfig16(hw, HFA384x_RID_MAXLOADTIME,
+                                          &(hw->dltimeout));
+        if (result)
                 return result;
-        }
+
         hw->dltimeout = le16_to_cpu(hw->dltimeout);
 
         pr_debug("flashdl_enable\n");
@@ -3071,9 +3072,9 @@ static void hfa384x_usbctlxq_run(hfa384x_t *hw)
                                   hfa384x_ctlxout_callback, hw);
                 hw->ctlx_urb.transfer_flags |= USB_QUEUE_BULK;
 
-                /* Now submit the URB and update the CTLX's state
-                 */
-                if ((result = SUBMIT_URB(&hw->ctlx_urb, GFP_ATOMIC)) == 0) {
+                /* Now submit the URB and update the CTLX's state */
+                result = SUBMIT_URB(&hw->ctlx_urb, GFP_ATOMIC);
+                if (result == 0) {
                         /* This CTLX is now running on the active queue */
                         head->state = CTLX_REQ_SUBMITTED;
 
@@ -3599,7 +3600,8 @@ static void hfa384x_int_rxmonitor(wlandevice_t *wlandev,
                          skblen - sizeof(p80211_caphdr_t));
         }
 
-        if ((skb = dev_alloc_skb(skblen)) == NULL) {
+        skb = dev_alloc_skb(skblen);
+        if (skb == NULL) {
                 printk(KERN_ERR
                        "alloc_skb failed trying to allocate %d bytes\n",
                        skblen);
@@ -3870,9 +3872,9 @@ retry:
 
 delresp:
         if (delete_resptimer) {
-                if ((timer_ok = del_timer(&hw->resptimer)) != 0) {
+                timer_ok = del_timer(&hw->resptimer);
+                if (timer_ok != 0)
                         hw->resp_timer_done = 1;
-                }
         }
 
         spin_unlock_irqrestore(&hw->ctlxq.lock, flags);
diff --git a/drivers/staging/wlan-ng/p80211conv.c b/drivers/staging/wlan-ng/p80211conv.c
index 5952c671073f..3ba5eabdb583 100644
--- a/drivers/staging/wlan-ng/p80211conv.c
+++ b/drivers/staging/wlan-ng/p80211conv.c
@@ -207,11 +207,10 @@ int skb_ether_to_p80211(wlandevice_t *wlandev, u32 ethconv,
 
                 p80211_wep->data = kmalloc(skb->len, GFP_ATOMIC);
 
-                if ((foo = wep_encrypt(wlandev, skb->data, p80211_wep->data,
-                                       skb->len,
-                                       (wlandev->hostwep &
-                                        HOSTWEP_DEFAULTKEY_MASK),
-                                       p80211_wep->iv, p80211_wep->icv))) {
+                foo = wep_encrypt(wlandev, skb->data, p80211_wep->data,
+                                  skb->len, (wlandev->hostwep &HOSTWEP_DEFAULTKEY_MASK),
+                                  p80211_wep->iv, p80211_wep->icv);
+                if (foo) {
                         printk(KERN_WARNING
                                "Host en-WEP failed, dropping frame (%d).\n",
                                foo);
@@ -323,11 +322,12 @@ int skb_p80211_to_ether(wlandevice_t *wlandev, u32 ethconv,
                                skb->len);
                         return 1;
                 }
-                if ((foo = wep_decrypt(wlandev, skb->data + payload_offset + 4,
+                foo = wep_decrypt(wlandev, skb->data + payload_offset + 4,
                                        payload_length - 8, -1,
                                        skb->data + payload_offset,
                                        skb->data + payload_offset +
-                                       payload_length - 4))) {
+                                       payload_length - 4);
+                if (foo) {
                         /* de-wep failed, drop skb. */
                         pr_debug("Host de-WEP failed, dropping frame (%d).\n",
                                  foo);
diff --git a/drivers/staging/wlan-ng/p80211netdev.c b/drivers/staging/wlan-ng/p80211netdev.c
index e27d72cf5714..763ab1187a1c 100644
--- a/drivers/staging/wlan-ng/p80211netdev.c
+++ b/drivers/staging/wlan-ng/p80211netdev.c
@@ -586,7 +586,8 @@ static int p80211knetdev_do_ioctl(netdevice_t *dev, struct ifreq *ifr, int cmd)
         }
 
         /* Allocate a buf of size req->len */
-        if ((msgbuf = kmalloc(req->len, GFP_KERNEL))) {
+        msgbuf = kmalloc(req->len, GFP_KERNEL);
+        if (msgbuf) {
                 if (copy_from_user(msgbuf, (void __user *)req->data, req->len))
                         result = -EFAULT;
                 else
diff --git a/drivers/staging/wlan-ng/p80211wext.c b/drivers/staging/wlan-ng/p80211wext.c
index 040c9e3e1d51..108a8060d1f5 100644
--- a/drivers/staging/wlan-ng/p80211wext.c
+++ b/drivers/staging/wlan-ng/p80211wext.c
@@ -549,14 +549,14 @@ static int p80211wext_siwencode(netdevice_t *dev,
         }
 
         /* Check the Key index first. */
-        if ((i = (erq->flags & IW_ENCODE_INDEX))) {
-
+        i = (erq->flags & IW_ENCODE_INDEX);
+        if (i) {
                 if ((i < 1) || (i > NUM_WEPKEYS)) {
                         err = -EINVAL;
                         goto exit;
-                } else
+                } else {
                         i--;
-
+                }
                 /* Set current key number only if no keys are given */
                 if (erq->flags & IW_ENCODE_NOKEY) {
                         result =