aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2009-10-01 18:44:29 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-10-01 19:11:16 -0400
commit462d26b5d2f17b6258f33c4d1e3310089b006489 (patch)
tree57fcb0f0f9a0cde918127d2b62fe799d55b27d05 /drivers/spi
parent6cdeb00218b0d0eaf1329d1e6a0959ee3f0fa14c (diff)
spi-imx: update state correctly
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Cc: David Brownell <dbrownell@users.sourceforge.net> Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi_imx.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/spi/spi_imx.c b/drivers/spi/spi_imx.c
index b1f530fd6bdc..a8f9bff529e5 100644
--- a/drivers/spi/spi_imx.c
+++ b/drivers/spi/spi_imx.c
@@ -443,6 +443,13 @@ static int spi_imx_setupxfer(struct spi_device *spi,
443 config.speed_hz = t ? t->speed_hz : spi->max_speed_hz; 443 config.speed_hz = t ? t->speed_hz : spi->max_speed_hz;
444 config.mode = spi->mode; 444 config.mode = spi->mode;
445 445
446 if (!config.speed_hz)
447 config.speed_hz = spi->max_speed_hz;
448 if (!config.bpw)
449 config.bpw = spi->bits_per_word;
450 if (!config.speed_hz)
451 config.speed_hz = spi->max_speed_hz;
452
446 spi_imx->config(spi_imx, &config); 453 spi_imx->config(spi_imx, &config);
447 454
448 return 0; 455 return 0;