aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/wilc1000
diff options
context:
space:
mode:
authorGravatar Georgios Emmanouil <geo.emmnl@gmail.com> 2017-03-02 17:38:05 +0200
committerGravatar Greg Kroah-Hartman <gregkh@linuxfoundation.org> 2017-03-09 14:43:46 +0100
commit33a32243fcd6b4883b22ffdd812f534b011a63b7 (patch)
tree2c5735cd473e661166a2b1a47988d74e3ff05628 /drivers/staging/wilc1000
parentStaging:wilc1000:host_interface: Removed unnecessary blank line (diff)
downloadlinux-33a32243fcd6b4883b22ffdd812f534b011a63b7.tar.gz
linux-33a32243fcd6b4883b22ffdd812f534b011a63b7.tar.bz2
linux-33a32243fcd6b4883b22ffdd812f534b011a63b7.zip
Staging:wilc1000:host_interface: Integrated two 'if' statements to a single 'if' statement
Removed unnecessary 'if' statement and integrated the condition to the previous 'if' statement. Signed-off-by: Georgios Emmanouil <geo.emmnl@gmail.com> Reviewed-by: Julian Calaby <julian.calaby@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/wilc1000')
-rw-r--r--drivers/staging/wilc1000/host_interface.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c
index 15ff0a89b6ea..4679372d7d16 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -1355,13 +1355,11 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct wilc_vif *vif,
} else {
strConnectInfo.status = pstrConnectRespInfo->status;
- if (strConnectInfo.status == SUCCESSFUL_STATUSCODE) {
- if (pstrConnectRespInfo->ies) {
- strConnectInfo.resp_ies_len = pstrConnectRespInfo->ies_len;
- strConnectInfo.resp_ies = kmalloc(pstrConnectRespInfo->ies_len, GFP_KERNEL);
- memcpy(strConnectInfo.resp_ies, pstrConnectRespInfo->ies,
- pstrConnectRespInfo->ies_len);
- }
+ if (strConnectInfo.status == SUCCESSFUL_STATUSCODE && pstrConnectRespInfo->ies) {
+ strConnectInfo.resp_ies_len = pstrConnectRespInfo->ies_len;
+ strConnectInfo.resp_ies = kmalloc(pstrConnectRespInfo->ies_len, GFP_KERNEL);
+ memcpy(strConnectInfo.resp_ies, pstrConnectRespInfo->ies,
+ pstrConnectRespInfo->ies_len);
}
if (pstrConnectRespInfo) {