diff options
| author | Heiner Kallweit <hkallweit1@gmail.com> | 2016-10-28 07:58:46 +0200 |
|---|---|---|
| committer | Cyrille Pitchen <cyrille.pitchen@atmel.com> | 2017-02-10 13:54:55 +0100 |
| commit | 9e276de6a367cde07c1a63522152985d4e5cca8b (patch) | |
| tree | c58a026cd29238a9f6c07c9b96a1185a82e6497d /drivers | |
| parent | 9e84609e8cdb4ce841cc2f9a217996a0b1198d29 (diff) | |
| download | linux-9e276de6a367cde07c1a63522152985d4e5cca8b.tar.gz linux-9e276de6a367cde07c1a63522152985d4e5cca8b.tar.bz2 linux-9e276de6a367cde07c1a63522152985d4e5cca8b.zip | |
mtd: m25p80: consider max message size in m25p80_read
Consider a message size limit when calculating the maximum amount
of data that can be read.
The message size limit has been introduced with 4.9, so cc it
to stable.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/devices/m25p80.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index 9cf7fcd28034..16a7df2a0246 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c @@ -172,7 +172,8 @@ static ssize_t m25p80_read(struct spi_nor *nor, loff_t from, size_t len, t[1].rx_buf = buf; t[1].rx_nbits = m25p80_rx_nbits(nor); - t[1].len = min(len, spi_max_transfer_size(spi)); + t[1].len = min3(len, spi_max_transfer_size(spi), + spi_max_message_size(spi) - t[0].len); spi_message_add_tail(&t[1], &m); ret = spi_sync(spi, &m); |