summaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.8/009-spi-bcm63xx-check-spi-bits_per_word-in-spi_setup.patch
diff options
context:
space:
mode:
authorjogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-04-23 13:55:36 +0000
committerjogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-04-23 13:55:36 +0000
commite2428ebd83861f693ac94cbe2662021d4e7f3775 (patch)
tree5ef4da4d4811465ed5574bd3d084fbf7cb928e21 /target/linux/brcm63xx/patches-3.8/009-spi-bcm63xx-check-spi-bits_per_word-in-spi_setup.patch
parente3dfb1052672f7359784de8d1002a8eafebc2b68 (diff)
bcm63xx: update patches with upstream submissions
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36407 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/patches-3.8/009-spi-bcm63xx-check-spi-bits_per_word-in-spi_setup.patch')
-rw-r--r--target/linux/brcm63xx/patches-3.8/009-spi-bcm63xx-check-spi-bits_per_word-in-spi_setup.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/target/linux/brcm63xx/patches-3.8/009-spi-bcm63xx-check-spi-bits_per_word-in-spi_setup.patch b/target/linux/brcm63xx/patches-3.8/009-spi-bcm63xx-check-spi-bits_per_word-in-spi_setup.patch
new file mode 100644
index 000000000..49a7ac27c
--- /dev/null
+++ b/target/linux/brcm63xx/patches-3.8/009-spi-bcm63xx-check-spi-bits_per_word-in-spi_setup.patch
@@ -0,0 +1,29 @@
+From 13a364be644ed9b4666d452756556bb98afdcc56 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jogo@openwrt.org>
+Date: Mon, 11 Mar 2013 13:48:27 +0100
+Subject: [PATCH 07/12] spi/bcm63xx: check spi bits_per_word in spi_setup
+
+Instead of fixing up the bits_per_word (which the spi subsystem already
+does for us), check it for supported values.
+
+Signed-off-by: Jonas Gorski <jogo@openwrt.org>
+---
+ drivers/spi/spi-bcm63xx.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+--- a/drivers/spi/spi-bcm63xx.c
++++ b/drivers/spi/spi-bcm63xx.c
+@@ -151,8 +151,11 @@ static void bcm63xx_spi_setup_transfer(s
+
+ static int bcm63xx_spi_setup(struct spi_device *spi)
+ {
+- if (!spi->bits_per_word)
+- spi->bits_per_word = 8;
++ if (spi->bits_per_word != 8) {
++ dev_err(&spi->dev, "%s, unsupported bits_per_word=%d\n",
++ __func__, spi->bits_per_word);
++ return -EINVAL;
++ }
+
+ return 0;
+ }