From e8164f26178c5d1d8d2b62c90bd66dcc5b295ec1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Thu, 1 Oct 2009 15:44:32 -0700 Subject: [PATCH] --- yaml --- r: 166675 b: refs/heads/master c: d1c627b59c8e69d40b94a4ff28a582a84c6a95a3 h: refs/heads/master i: 166673: a9807175aeffc42f7b6b5872e1e94c247f4ccc0a 166671: 6d9bfdaedd22fc3e57f265997a333f261ffb2545 v: v3 --- [refs] | 2 +- trunk/drivers/spi/spi_imx.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index efb602d44bf3..74ead5c76050 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4388eb11351660c7688a4756aa6da99bfb4bc129 +refs/heads/master: d1c627b59c8e69d40b94a4ff28a582a84c6a95a3 diff --git a/trunk/drivers/spi/spi_imx.c b/trunk/drivers/spi/spi_imx.c index b6a8149220fb..2fec1170b6c0 100644 --- a/trunk/drivers/spi/spi_imx.c +++ b/trunk/drivers/spi/spi_imx.c @@ -442,6 +442,7 @@ static int spi_imx_setupxfer(struct spi_device *spi, config.bpw = t ? t->bits_per_word : spi->bits_per_word; config.speed_hz = t ? t->speed_hz : spi->max_speed_hz; config.mode = spi->mode; + config.cs = spi_imx->chipselect[spi->chip_select]; if (!config.speed_hz) config.speed_hz = spi->max_speed_hz;