summaryrefslogtreecommitdiff
path: root/drivers/spi
diff options
context:
space:
mode:
authorJoel Stanley <joel@jms.id.au>2022-03-08 10:48:37 +0300
committerJoel Stanley <joel@jms.id.au>2022-03-08 10:48:40 +0300
commitc4c3fba61580d267568c5c9cf10c928a41ba38a4 (patch)
tree96e9f51838e6b792a9d099c7580faeb51eb7d5bd /drivers/spi
parentde0980ea2d5360bd1d7472e62231a03c108f20c2 (diff)
parent8993e6067f263765fd26edabf3e3012e3ec4d81e (diff)
downloadlinux-c4c3fba61580d267568c5c9cf10c928a41ba38a4.tar.xz
Merge tag 'v5.15.26' into dev-5.15
This is the 5.15.26 stable release Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-zynq-qspi.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/spi/spi-zynq-qspi.c b/drivers/spi/spi-zynq-qspi.c
index cfa222c9bd5e..78f31b61a2aa 100644
--- a/drivers/spi/spi-zynq-qspi.c
+++ b/drivers/spi/spi-zynq-qspi.c
@@ -570,6 +570,9 @@ static int zynq_qspi_exec_mem_op(struct spi_mem *mem,
if (op->dummy.nbytes) {
tmpbuf = kzalloc(op->dummy.nbytes, GFP_KERNEL);
+ if (!tmpbuf)
+ return -ENOMEM;
+
memset(tmpbuf, 0xff, op->dummy.nbytes);
reinit_completion(&xqspi->data_completion);
xqspi->txbuf = tmpbuf;