From adca6114e4f3dfb8db44287c58715f9939ea44ca Mon Sep 17 00:00:00 2001 From: Michael Hennerich Date: Sun, 21 Aug 2011 21:04:12 -0700 Subject: [PATCH] --- yaml --- r: 263265 b: refs/heads/master c: 5b9063b19caaffe7135e1f9b8b22174ded0f586b h: refs/heads/master i: 263263: b0f9475c28d8590178376b8419acf75e57e70872 v: v3 --- [refs] | 2 +- trunk/drivers/input/misc/ad714x-spi.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e1c9bfd725ec..40d7754fe5a3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b9cc510b395543cb7dba89c76421d23ed9e85f95 +refs/heads/master: 5b9063b19caaffe7135e1f9b8b22174ded0f586b diff --git a/trunk/drivers/input/misc/ad714x-spi.c b/trunk/drivers/input/misc/ad714x-spi.c index 4120dd549305..da83ac9bed7e 100644 --- a/trunk/drivers/input/misc/ad714x-spi.c +++ b/trunk/drivers/input/misc/ad714x-spi.c @@ -54,6 +54,12 @@ static int ad714x_spi_write(struct device *dev, unsigned short reg, static int __devinit ad714x_spi_probe(struct spi_device *spi) { struct ad714x_chip *chip; + int err; + + spi->bits_per_word = 8; + err = spi_setup(spi); + if (err < 0) + return err; chip = ad714x_probe(&spi->dev, BUS_SPI, spi->irq, ad714x_spi_read, ad714x_spi_write);