diff options
author | Joel Stanley <joel@jms.id.au> | 2022-03-22 15:24:37 +0300 |
---|---|---|
committer | Joel Stanley <joel@jms.id.au> | 2022-03-22 15:24:45 +0300 |
commit | 8505c31863aadb65c2d08381eca8fc0baaa3babb (patch) | |
tree | 89af165ec212ab6e5f37627ae44417eb6055a7d1 /drivers/mtd | |
parent | b3b33a63865dc178212ef70f87acf9ab64436567 (diff) | |
parent | 0464ab17184b8fdec6676fabe76059b90e54e74f (diff) | |
download | linux-8505c31863aadb65c2d08381eca8fc0baaa3babb.tar.xz |
Merge tag 'v5.15.30' into dev-5.15
This is the 5.15.30 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'drivers/mtd')
-rw-r--r-- | drivers/mtd/spi-nor/xilinx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mtd/spi-nor/xilinx.c b/drivers/mtd/spi-nor/xilinx.c index 1138bdbf4199..75dd13a39040 100644 --- a/drivers/mtd/spi-nor/xilinx.c +++ b/drivers/mtd/spi-nor/xilinx.c @@ -66,7 +66,8 @@ static int xilinx_nor_setup(struct spi_nor *nor, /* Flash in Power of 2 mode */ nor->page_size = (nor->page_size == 264) ? 256 : 512; nor->mtd.writebufsize = nor->page_size; - nor->mtd.size = 8 * nor->page_size * nor->info->n_sectors; + nor->params->size = 8 * nor->page_size * nor->info->n_sectors; + nor->mtd.size = nor->params->size; nor->mtd.erasesize = 8 * nor->page_size; } else { /* Flash in Default addressing mode */ |