| Message ID | 20150211102509.GB18515@mwanda |
|---|---|
| State | Accepted |
| Commit | dd58d38fb30aa9ab52e792092cbd55c1dbc6e974 |
| Headers | show |
Hi, On Wed, Feb 11, 2015 at 01:25:09PM +0300, Dan Carpenter wrote: > 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> > > diff --git a/drivers/mtd/nand/hisi504_nand.c b/drivers/mtd/nand/hisi504_nand.c > index 484e1db..289ad3a 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 << Looks good to me. Zhou, can I get an ack? > HINFC504_CON_ECCTYPE_SHIFT), HINFC504_CON); > > host->offset = 0; Brian
On Wed, Feb 11, 2015 at 01:25:09PM +0300, Dan Carpenter wrote: > 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> Pushed to l2-mtd.git. Thanks. Brian
On 2015/2/13 5:37, Brian Norris wrote: > Hi, > > On Wed, Feb 11, 2015 at 01:25:09PM +0300, Dan Carpenter wrote: >> 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> >> >> diff --git a/drivers/mtd/nand/hisi504_nand.c b/drivers/mtd/nand/hisi504_nand.c >> index 484e1db..289ad3a 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 << > > Looks good to me. Zhou, can I get an ack? Hi Brian, Sorry for late for the reason of Chinese new year vacation. You can apply that above, My mistake there. Thanks, Zhou Wang > >> HINFC504_CON_ECCTYPE_SHIFT), HINFC504_CON); >> >> host->offset = 0; > > Brian > >
On 2015/2/15 17:07, Brian Norris wrote: > On Wed, Feb 11, 2015 at 01:25:09PM +0300, Dan Carpenter wrote: >> 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> > > Pushed to l2-mtd.git. Thanks. Hi Brian, Thanks for the pushing. Zhou Wang > > Brian > >
diff --git a/drivers/mtd/nand/hisi504_nand.c b/drivers/mtd/nand/hisi504_nand.c index 484e1db..289ad3a 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;
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>