From: Dan Carpenter Date: Wed, 11 Feb 2015 10:25:09 +0000 (+0300) Subject: mtd: hisilicon: && vs & typo X-Git-Tag: v4.0-rc1~50^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dd58d38fb30aa9ab52e792092cbd55c1dbc6e974;p=thirdparty%2Fkernel%2Flinux.git mtd: hisilicon: && vs & typo The intent was to mask away some bits here, not to test true or false. Fix: 54f531f6e332 ('mtd: hisilicon: add a new NAND controller driver for hisilicon hip04 Soc') Signed-off-by: Dan Carpenter Signed-off-by: Brian Norris --- diff --git a/drivers/mtd/nand/hisi504_nand.c b/drivers/mtd/nand/hisi504_nand.c index 484e1db4d601d..289ad3ac3e80d 100644 --- a/drivers/mtd/nand/hisi504_nand.c +++ b/drivers/mtd/nand/hisi504_nand.c @@ -495,7 +495,7 @@ static void hisi_nfc_cmdfunc(struct mtd_info *mtd, unsigned command, int column, flag = hinfc_read(host, HINFC504_CON); if (chip->ecc.mode == NAND_ECC_HW) hinfc_write(host, - flag && ~(HINFC504_CON_ECCTYPE_MASK << + flag & ~(HINFC504_CON_ECCTYPE_MASK << HINFC504_CON_ECCTYPE_SHIFT), HINFC504_CON); host->offset = 0;