From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:46208) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R9kuy-0001ed-1S for qemu-devel@nongnu.org; Fri, 30 Sep 2011 17:46:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R9kuw-0003vL-N4 for qemu-devel@nongnu.org; Fri, 30 Sep 2011 17:46:51 -0400 Received: from v220110690675601.yourvserver.net ([78.47.199.172]:48027) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R9kuw-0003vB-E5 for qemu-devel@nongnu.org; Fri, 30 Sep 2011 17:46:50 -0400 From: Stefan Weil Date: Fri, 30 Sep 2011 23:46:09 +0200 Message-Id: <1317419169-8551-1-git-send-email-weil@mail.berlios.de> Subject: [Qemu-devel] [PATCH] etrax: Fix wrong conditional statement List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Edgar E. Iglesias" cppcheck reports an error: the conditional statement is always true. I assume that the register should be masked with 3, but could not test the code. Please test before applying this patch. Cc: Edgar E. Iglesias Signed-off-by: Stefan Weil --- hw/etraxfs_dma.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/etraxfs_dma.c b/hw/etraxfs_dma.c index d3082ac..72f089e 100644 --- a/hw/etraxfs_dma.c +++ b/hw/etraxfs_dma.c @@ -599,12 +599,12 @@ dma_winvalid (void *opaque, target_phys_addr_t addr, uint32_t value) static void dma_update_state(struct fs_dma_ctrl *ctrl, int c) { - if ((ctrl->channels[c].regs[RW_CFG] & 1) != 3) { + if ((ctrl->channels[c].regs[RW_CFG] & 3) != 3) { if (ctrl->channels[c].regs[RW_CFG] & 2) ctrl->channels[c].state = STOPPED; if (!(ctrl->channels[c].regs[RW_CFG] & 1)) ctrl->channels[c].state = RST; - } + } } static void -- 1.7.2.5