Revert "spi: nxp-fspi: fix the KASAN report out-of-bounds bug"
This reverts commit cf311de33d
.
This commit is contained in:
parent
23b583a310
commit
9d83979a0a
1 changed files with 2 additions and 3 deletions
|
@ -731,15 +731,14 @@ static void nxp_fspi_fill_txfifo(struct nxp_fspi *f,
|
||||||
if (i < op->data.nbytes) {
|
if (i < op->data.nbytes) {
|
||||||
u32 data = 0;
|
u32 data = 0;
|
||||||
int j;
|
int j;
|
||||||
int remaining = op->data.nbytes - i;
|
|
||||||
/* Wait for TXFIFO empty */
|
/* Wait for TXFIFO empty */
|
||||||
ret = fspi_readl_poll_tout(f, f->iobase + FSPI_INTR,
|
ret = fspi_readl_poll_tout(f, f->iobase + FSPI_INTR,
|
||||||
FSPI_INTR_IPTXWE, 0,
|
FSPI_INTR_IPTXWE, 0,
|
||||||
POLL_TOUT, true);
|
POLL_TOUT, true);
|
||||||
WARN_ON(ret);
|
WARN_ON(ret);
|
||||||
|
|
||||||
for (j = 0; j < ALIGN(remaining, 4); j += 4) {
|
for (j = 0; j < ALIGN(op->data.nbytes - i, 4); j += 4) {
|
||||||
memcpy(&data, buf + i + j, min_t(int, 4, remaining - j));
|
memcpy(&data, buf + i + j, 4);
|
||||||
fspi_writel(f, data, base + FSPI_TFDR + j);
|
fspi_writel(f, data, base + FSPI_TFDR + j);
|
||||||
}
|
}
|
||||||
fspi_writel(f, FSPI_INTR_IPTXWE, base + FSPI_INTR);
|
fspi_writel(f, FSPI_INTR_IPTXWE, base + FSPI_INTR);
|
||||||
|
|
Loading…
Add table
Reference in a new issue