summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi-imx.c
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2013-05-30 13:38:09 +0530
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-05-30 11:48:43 +0100
commit6051426fd0538eac4e28c55a08e4f4fb1c709b65 (patch)
tree7ce8a8d65c4ed9eeaff081a9a3aef810ff04db6d /drivers/spi/spi-imx.c
parent24778be20f87d5aadb19624fc768b3159fa43efc (diff)
downloadblackbird-op-linux-6051426fd0538eac4e28c55a08e4f4fb1c709b65.tar.gz
blackbird-op-linux-6051426fd0538eac4e28c55a08e4f4fb1c709b65.zip
spi: spi-imx: Fix compilation error
Fix compilation error due to a typo introduced by commit 24778be20f ("spi: convert drivers to use bits_per_word_mask"). Without this patch we get the following build errors: drivers/spi/spi-imx.c: In function ‘spi_imx_setupxfer’: drivers/spi/spi-imx.c:703:2: warning: no return statement in function returning non-void [-Wreturn-type] drivers/spi/spi-imx.c: At top level: drivers/spi/spi-imx.c:705:9: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘->’ token drivers/spi/spi-imx.c:707:2: error: expected identifier or ‘(’ before ‘return’ drivers/spi/spi-imx.c:708:1: error: expected identifier or ‘(’ before ‘}’ token Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Cc: Stephen Warren <swarren@wwwdotorg.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/spi/spi-imx.c')
-rw-r--r--drivers/spi/spi-imx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index cb88eeb74cc4..982667383dd5 100644
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -698,7 +698,7 @@ static int spi_imx_setupxfer(struct spi_device *spi,
} else if (config.bpw <= 16) {
spi_imx->rx = spi_imx_buf_rx_u16;
spi_imx->tx = spi_imx_buf_tx_u16;
- }
+ } else {
spi_imx->rx = spi_imx_buf_rx_u32;
spi_imx->tx = spi_imx_buf_tx_u32;
}
OpenPOWER on IntegriCloud