From: Tobias Polzer Date: Thu, 13 Jun 2013 21:00:35 +0000 (+0200) Subject: staging: csr: Fix obvious logic error in staging/csr X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0a58857707c8bc07dcca39a4a6b2c88e37ff2b01;p=linux-beck.git staging: csr: Fix obvious logic error in staging/csr In uf_process_ma_packet_req() (staging/csr/unifi_pdu_processing.c), the test for (staInfo->timSet != CSR_WIFI_TIM_RESET) || (staInfo->timSet != CSR_WIFI_TIM_RESETTING) obviously makes no sense and causes GCC to emit a warning if -Wlogical-op is enabled. As suggested in the referenced bug report, || was replaced by &&. References: https://bugzilla.kernel.org/show_bug.cgi?id=46571 Reported-By: David Binderman Signed-off-by: Tobias Polzer Signed-off-by: Dominik Paulus Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/csr/unifi_pdu_processing.c b/drivers/staging/csr/unifi_pdu_processing.c index b81a57292020..04fe9e2acf0e 100644 --- a/drivers/staging/csr/unifi_pdu_processing.c +++ b/drivers/staging/csr/unifi_pdu_processing.c @@ -2704,7 +2704,7 @@ static void uf_handle_uspframes_delivery(unifi_priv_t * priv, CsrWifiRouterCtrlS */ is_all_ac_deliver_enabled_and_moredata(staInfo, &allDeliveryEnabled, &dataAvailable); if ((allDeliveryEnabled && !dataAvailable)) { - if ((staInfo->timSet != CSR_WIFI_TIM_RESET) || (staInfo->timSet != CSR_WIFI_TIM_RESETTING)) { + if ((staInfo->timSet != CSR_WIFI_TIM_RESET) && (staInfo->timSet != CSR_WIFI_TIM_RESETTING)) { staInfo->updateTimReqQueued = (u8) CSR_WIFI_TIM_RESET; unifi_trace(priv, UDBG4, " --uf_handle_uspframes_delivery, UAPSD timset\n"); if (!staInfo->timRequestPendingFlag) {