diff options
| author | Tom Rini <trini@konsulko.com> | 2021-10-23 10:49:28 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-10-23 10:49:28 -0400 |
| commit | 355d1e24f6143c4839be3c015c191421c4e9449c (patch) | |
| tree | ff68e868d404d117f3f9599740f83fd73c99c306 /fs | |
| parent | f055f2e5a2038002519e5b9affbf259345f4ade9 (diff) | |
| parent | b9cfd8b0911209e2ebec887e497510ee42f9e788 (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-spi
- Fix mtd erase with mtdpart (Marek Behún)
- NXP fspi driver fixes (Kuldeep Singh)
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/yaffs2/yaffs_mtdif.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/yaffs2/yaffs_mtdif.c b/fs/yaffs2/yaffs_mtdif.c index d338f9aa91..50fed2d4b1 100644 --- a/fs/yaffs2/yaffs_mtdif.c +++ b/fs/yaffs2/yaffs_mtdif.c @@ -145,7 +145,6 @@ int nandmtd_EraseBlockInNAND(struct yaffs_dev *dev, int blockNumber) ei.len = dev->data_bytes_per_chunk * dev->param.chunks_per_block; ei.time = 1000; ei.retries = 2; - ei.callback = NULL; ei.priv = (u_long) dev; /* Todo finish off the ei if required */ |