From: Jonas Gorski <jogo@openwrt.org>
Date: Mon, 11 Mar 2013 23:13:42 +0000 (+0100)
Subject: spi/bcm63xx: check spi bits_per_word in spi_setup
X-Git-Tag: next-20130320~35^2~5
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e2bdae06329ef3fb8918032735cd963efc701b7e;p=karo-tx-linux.git

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>
Acked-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---

diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c
index 04c460e8bd27..b64229ca7f54 100644
--- a/drivers/spi/spi-bcm63xx.c
+++ b/drivers/spi/spi-bcm63xx.c
@@ -151,8 +151,11 @@ static void bcm63xx_spi_setup_transfer(struct spi_device *spi,
 
 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;
 }