diff options
author | Jonas Gorski <jogo@openwrt.org> | 2012-11-24 14:19:09 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2012-11-24 14:19:09 +0000 |
commit | 1baeede9398688bcd895cc730f6f74fd60eee442 (patch) | |
tree | 390b61df85cfe3a3f076a3c7244d2bb6217117c2 /target/linux/brcm63xx/patches-3.6/106-bcm63xx-fix-transfer-bits_per_words-check.patch | |
parent | 2a01fa43a5364b6f60125f889505d8dd458dcc96 (diff) | |
download | master-31e0f0ae-1baeede9398688bcd895cc730f6f74fd60eee442.tar.gz master-31e0f0ae-1baeede9398688bcd895cc730f6f74fd60eee442.tar.bz2 master-31e0f0ae-1baeede9398688bcd895cc730f6f74fd60eee442.zip |
bcm63xx: fix spi transfer handling
* Accept transfers without bits_per_word set.
* Work around the inability of the hardware of keeping CS asserted.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 34320
Diffstat (limited to 'target/linux/brcm63xx/patches-3.6/106-bcm63xx-fix-transfer-bits_per_words-check.patch')
-rw-r--r-- | target/linux/brcm63xx/patches-3.6/106-bcm63xx-fix-transfer-bits_per_words-check.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/target/linux/brcm63xx/patches-3.6/106-bcm63xx-fix-transfer-bits_per_words-check.patch b/target/linux/brcm63xx/patches-3.6/106-bcm63xx-fix-transfer-bits_per_words-check.patch new file mode 100644 index 0000000000..37d9d49d6f --- /dev/null +++ b/target/linux/brcm63xx/patches-3.6/106-bcm63xx-fix-transfer-bits_per_words-check.patch @@ -0,0 +1,29 @@ +From fbef4dff80be6254e36ab5b9c655d248a3991ded Mon Sep 17 00:00:00 2001 +From: Jonas Gorski <jonas.gorski@gmail.com> +Date: Sat, 24 Nov 2012 12:08:22 +0100 +Subject: [PATCH 3.7] spi/bcm63xx: fix transfer bits_per_words check + +Transfers often do not have bits_per_words set, so use the spi device's +bits_per_words in this case. + +This fixes the driver rejecting valid transfers e.g. generated by +spi_write() or spi_read(). + +Cc: stable@vger.kernel.org +Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> +--- + drivers/spi/spi-bcm63xx.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/spi/spi-bcm63xx.c ++++ b/drivers/spi/spi-bcm63xx.c +@@ -103,7 +103,8 @@ static int bcm63xx_spi_check_transfer(st + { + u8 bits_per_word; + +- bits_per_word = (t) ? t->bits_per_word : spi->bits_per_word; ++ bits_per_word = (t && t->bits_per_word) ? ++ t->bits_per_word : spi->bits_per_word; + if (bits_per_word != 8) { + dev_err(&spi->dev, "%s, unsupported bits_per_word=%d\n", + __func__, bits_per_word); |