From 95d868aa046ebc6c9878dae7ef9b2d870ee2f0ae Mon Sep 17 00:00:00 2001
From: Oskar Schirmer <os@emlix.com>
Date: Tue, 8 Jun 2010 01:12:22 -0700
Subject: [PATCH] --- yaml --- r: 200488 b: refs/heads/master c:
 cd9b6fdf798841eb15253f928e762eee5260d347 h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/input/touchscreen/ad7877.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 06623f2e4335..c85119f2a9b9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b75f775288b90a83a8708a5af663a03d4bbc9ce
+refs/heads/master: cd9b6fdf798841eb15253f928e762eee5260d347
diff --git a/trunk/drivers/input/touchscreen/ad7877.c b/trunk/drivers/input/touchscreen/ad7877.c
index 0d2d7e54b465..5f0221cffef9 100644
--- a/trunk/drivers/input/touchscreen/ad7877.c
+++ b/trunk/drivers/input/touchscreen/ad7877.c
@@ -679,6 +679,13 @@ static int __devinit ad7877_probe(struct spi_device *spi)
 		return -EINVAL;
 	}
 
+	spi->bits_per_word = 16;
+	err = spi_setup(spi);
+	if (err) {
+		dev_dbg(&spi->dev, "spi master doesn't support 16 bits/word\n");
+		return err;
+	}
+
 	ts = kzalloc(sizeof(struct ad7877), GFP_KERNEL);
 	input_dev = input_allocate_device();
 	if (!ts || !input_dev) {