From: Georgios Emmanouil Date: Thu, 2 Mar 2017 15:38:05 +0000 (+0200) Subject: Staging:wilc1000:host_interface: Integrated two 'if' statements to a single 'if'... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=33a32243fcd6b4883b22ffdd812f534b011a63b7;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git 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 Reviewed-by: Julian Calaby Signed-off-by: Greg Kroah-Hartman --- 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) {