diff options
| author | Tom Rini <trini@konsulko.com> | 2025-04-07 16:40:02 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2025-04-08 11:43:23 -0600 |
| commit | ff61d6bfd1c9534d3fc2397846a5899639f2e55d (patch) | |
| tree | dcfe4bc52848a5637c975a3352b57885e5b8a06d /drivers/mtd/nand/raw/meson_nand.c | |
| parent | 34820924edbc4ec7803eb89d9852f4b870fa760a (diff) | |
| parent | f892a7f397a66d8d09f418d1e0e06dfb48bac27d (diff) | |
Merge branch 'next'
Note that this undoes the changes of commit cf6d4535cc4c ("x86:
emulation: Disable bloblist for now") as that was intended only for the
release due to time.
Diffstat (limited to 'drivers/mtd/nand/raw/meson_nand.c')
| -rw-r--r-- | drivers/mtd/nand/raw/meson_nand.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/mtd/nand/raw/meson_nand.c b/drivers/mtd/nand/raw/meson_nand.c index 28c851f103b..7e683f49c5e 100644 --- a/drivers/mtd/nand/raw/meson_nand.c +++ b/drivers/mtd/nand/raw/meson_nand.c @@ -618,9 +618,7 @@ static int meson_nfc_write_page_hwecc(struct mtd_info *mtd, struct nand_chip *ch memcpy(meson_chip->data_buf, buf, mtd->writesize); memset(meson_chip->info_buf, 0, chip->ecc.steps * PER_INFO_BYTE); - - if (oob_required) - meson_nfc_set_user_byte(chip, chip->oob_poi); + meson_nfc_set_user_byte(chip, chip->oob_poi); return meson_nfc_write_page_sub(chip, page, false); } |