From: Qipan Li <Qipan.Li@csr.com>
Date: Mon, 27 Apr 2015 09:22:28 +0000 (+0000)
Subject: spi: sirf: replace BUG condition by error code for unsupported transfer
X-Git-Tag: v4.2-rc1~142^2^2~5
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f08654a2b582b4e48e8a4a3d2c5c98832adc4387;p=karo-tx-linux.git

spi: sirf: replace BUG condition by error code for unsupported transfer

return error for unsupported bits-per-word format, BUG() is not right
for this scenerios as we are not an ASSERT but an error handler.

Signed-off-by: Qipan Li <Qipan.Li@csr.com>
Signed-off-by: Barry Song <baohua.song@csr.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---

diff --git a/drivers/spi/spi-sirf.c b/drivers/spi/spi-sirf.c
index f5715c9f68b0..a50ee9b644ae 100644
--- a/drivers/spi/spi-sirf.c
+++ b/drivers/spi/spi-sirf.c
@@ -559,7 +559,8 @@ spi_sirfsoc_setup_transfer(struct spi_device *spi, struct spi_transfer *t)
 		sspi->tx_word = spi_sirfsoc_tx_word_u32;
 		break;
 	default:
-		BUG();
+		dev_err(&spi->dev, "bpw %d not supported\n", bits_per_word);
+		return -EINVAL;
 	}
 
 	sspi->word_width = DIV_ROUND_UP(bits_per_word, 8);