Return-path: Received: from webhosting01.bon.m2soft.com ([195.38.20.32]:33233 "EHLO webhosting01.bon.m2soft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753243Ab0KPUVf (ORCPT ); Tue, 16 Nov 2010 15:21:35 -0500 Date: Tue, 16 Nov 2010 21:19:53 +0100 From: Nicolas Kaiser To: Mauro Carvalho Chehab Cc: Jarod Wilson , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] drivers/media: nuvoton: always true expression Message-ID: <20101116211953.238012db@absol.kitzblitz> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit List-ID: Sender: I noticed that the second part of this conditional is always true. Would the intention be to strictly check on both chip_major and chip_minor? Signed-off-by: Nicolas Kaiser --- drivers/media/IR/nuvoton-cir.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/IR/nuvoton-cir.c b/drivers/media/IR/nuvoton-cir.c index 301be53..896463b 100644 --- a/drivers/media/IR/nuvoton-cir.c +++ b/drivers/media/IR/nuvoton-cir.c @@ -249,8 +249,8 @@ static int nvt_hw_detect(struct nvt_dev *nvt) chip_minor = nvt_cr_read(nvt, CR_CHIP_ID_LO); nvt_dbg("%s: chip id: 0x%02x 0x%02x", chip_id, chip_major, chip_minor); - if (chip_major != CHIP_ID_HIGH && - (chip_minor != CHIP_ID_LOW || chip_minor != CHIP_ID_LOW2)) + if (chip_major != CHIP_ID_HIGH || + (chip_minor != CHIP_ID_LOW && chip_minor != CHIP_ID_LOW2)) ret = -ENODEV; nvt_efm_disable(nvt); -- 1.7.2.2