Merge branch 'spi-5.3' into spi-linus

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/spi/spi-bcm-qspi.c b/drivers/spi/spi-bcm-qspi.c
index 902bdbfedea8..0dbfd2496ab8 100644
--- a/drivers/spi/spi-bcm-qspi.c
+++ b/drivers/spi/spi-bcm-qspi.c
@@ -343,7 +343,7 @@ static int bcm_qspi_bspi_set_flex_mode(struct bcm_qspi *qspi,
 {
         int bpc = 0, bpp = 0;
         u8 command = op->cmd.opcode;
-        int width  = op->cmd.buswidth ? op->cmd.buswidth : SPI_NBITS_SINGLE;
+        int width = op->data.buswidth ? op->data.buswidth : SPI_NBITS_SINGLE;
         int addrlen = op->addr.nbytes;
         int flex_mode = 1;
 
@@ -981,7 +981,7 @@ static int bcm_qspi_exec_mem_op(struct spi_mem *mem,
         if (mspi_read)
                 return bcm_qspi_mspi_exec_mem_op(spi, op);
 
-        ret = bcm_qspi_bspi_set_mode(qspi, op, -1);
+        ret = bcm_qspi_bspi_set_mode(qspi, op, 0);
 
         if (!ret)
                 ret = bcm_qspi_bspi_exec_mem_op(spi, op);