diff options
| author | Tom Rini <trini@konsulko.com> | 2019-02-28 14:22:03 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-02-28 14:22:03 -0500 |
| commit | 7869e647a60ae706457bb601a3c2ea51e9fdd413 (patch) | |
| tree | 2e77dd316e2c5899f780ac6cf037117420d7febd /drivers | |
| parent | 783e66816d101f970b185083377846059d4d577d (diff) | |
| parent | 438dcabb75d6b9b0e7f887befb753d1863f14deb (diff) | |
Merge branch '2019-02-29-master-imports'
- Assorted BSP fixes
- Kbuild fix
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/spi/omap3_spi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/omap3_spi.c b/drivers/spi/omap3_spi.c index c7fcf050a5..ff4c700645 100644 --- 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; |