staging: wilc1000: merge 'if' statements that test the same condition

Merge the instructions of two 'if' statements that test the same
condition and move a 'memcpy' instruction related to a different variable.
Issue found with coccicheck.

Signed-off-by: Dafna Hirschfeld <dafna3@gmail.com>
Acked-by: Julia Lawall <julia.lawall@lip6.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 621810d704501d51ca1546d399bfcda3854981cb..557ab99e62269e0db0eea0831a979a193028b653 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -959,18 +959,14 @@ static int add_key(struct wiphy *wiphy, struct net_device *netdev, u8 key_index,
                                }
 
                                kfree(priv->wilc_ptk[key_index]->key);
-
                                priv->wilc_ptk[key_index]->key = kmalloc(params->key_len, GFP_KERNEL);
+                               memcpy(priv->wilc_ptk[key_index]->key, params->key, params->key_len);
 
                                kfree(priv->wilc_ptk[key_index]->seq);
-
-                               if (params->seq_len > 0)
+                               if (params->seq_len > 0) {
                                        priv->wilc_ptk[key_index]->seq = kmalloc(params->seq_len, GFP_KERNEL);
-
-                               memcpy(priv->wilc_ptk[key_index]->key, params->key, params->key_len);
-
-                               if (params->seq_len > 0)
                                        memcpy(priv->wilc_ptk[key_index]->seq, params->seq, params->seq_len);
+                               }
 
                                priv->wilc_ptk[key_index]->cipher = params->cipher;
                                priv->wilc_ptk[key_index]->key_len = params->key_len;