aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2015-02-11 13:25:09 +0300
committerBrian Norris <computersforpeace@gmail.com>2015-02-15 01:05:05 -0800
commitdd58d38fb30aa9ab52e792092cbd55c1dbc6e974 (patch)
tree504eb9617039cc98c73712046c0cdaf756e83ae6 /drivers/mtd
parentmtd: hisilicon: add device tree binding documentation (diff)
downloadlinux-dev-dd58d38fb30aa9ab52e792092cbd55c1dbc6e974.tar.xz
linux-dev-dd58d38fb30aa9ab52e792092cbd55c1dbc6e974.zip
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 <dan.carpenter@oracle.com> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/nand/hisi504_nand.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/hisi504_nand.c b/drivers/mtd/nand/hisi504_nand.c
index 484e1db4d601..289ad3ac3e80 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;