Merge branch '2019-10-11-master-imports'

[oweals/u-boot.git] / drivers / spi / omap3_spi.c

diff --git a/drivers/spi/omap3_spi.c b/drivers/spi/omap3_spi.c
index c7fcf050a58738090eb7876d7622c52c949690fd..ff4c700645c3c81b3dbb9a4d482f4cc62bbf2712 100644 (file)
--- a/drivers/spi/omap3_spi.c
+++ b/drivers/spi/omap3_spi.c
@@ -415,7 +415,7 @@ static void _omap3_spi_set_wordlen(struct omap3_spi_priv *priv)
        unsigned int confr;
 
        /* McSPI individual channel configuration */
-       confr = readl(&priv->regs->channel[priv->wordlen].chconf);
+       confr = readl(&priv->regs->channel[priv->cs].chconf);
 
        /* wordlength */
        confr &= ~OMAP3_MCSPI_CHCONF_WL_MASK;