diff --git a/[refs] b/[refs] index 246b83a38396..da805e7daaf8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fd508da2208696db146cd1be2bb2e8b799f6e3a2 +refs/heads/master: 00355b0baadf949f02ab7d3e2bd222e3fbcc72ee diff --git a/trunk/drivers/mtd/nand/bf5xx_nand.c b/trunk/drivers/mtd/nand/bf5xx_nand.c index 5c999e01db6f..d48cc39afc21 100644 --- a/trunk/drivers/mtd/nand/bf5xx_nand.c +++ b/trunk/drivers/mtd/nand/bf5xx_nand.c @@ -648,7 +648,7 @@ static int bf5xx_nand_hw_init(struct bf5xx_nand_info *info) val = (plat->page_size << NFC_PG_SIZE_OFFSET) | (plat->data_width << NFC_NWIDTH_OFFSET) | (plat->rd_dly << NFC_RDDLY_OFFSET) | - (plat->rd_dly << NFC_WRDLY_OFFSET); + (plat->wr_dly << NFC_WRDLY_OFFSET); dev_dbg(info->device, "NFC_CTL is 0x%04x\n", val); bfin_write_NFC_CTL(val);