mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 01:11:14 +00:00
196f3d586f
5.4.102 backported a lot of stuff that our WireGuard backport already did, in addition to other patches we had, so those patches were removed from that part of the series. In the process other patches were refreshed or reworked to account for upstream changes. This commit involved `update_kernel.sh -v -u 5.4`. Cc: John Audia <graysky@archlinux.us> Cc: David Bauer <mail@david-bauer.net> Cc: Petr Štetiar <ynezz@true.cz> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
23 lines
647 B
Diff
23 lines
647 B
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
Date: Thu, 22 Feb 2018 11:11:57 +0100
|
|
Subject: [PATCH] mtd: spi-nor: allow NOR driver to write fewer bytes than
|
|
requested
|
|
|
|
The write size can be constrained by the maximum message/transfer size
|
|
of the SPI controller. Only check for ret = 0 to avoid an infinite loop.
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
---
|
|
|
|
--- a/drivers/mtd/spi-nor/spi-nor.c
|
|
+++ b/drivers/mtd/spi-nor/spi-nor.c
|
|
@@ -2706,7 +2706,7 @@ static int spi_nor_write(struct mtd_info
|
|
|
|
write_enable(nor);
|
|
ret = spi_nor_write_data(nor, addr, page_remain, buf + i);
|
|
- if (ret < 0)
|
|
+ if (ret <= 0)
|
|
goto write_err;
|
|
written = ret;
|
|
|