From b591b3ed5e2318edfc74c11479d19e73d47113c0 Mon Sep 17 00:00:00 2001
From: Alan Horstmann <gineera@aspect135.co.uk>
Date: Tue, 9 Sep 2008 19:25:49 +0100
Subject: [PATCH] --- yaml --- r: 111029 b: refs/heads/master c:
 8569be3cf90c279957bafd4e66f1332f041831d3 h: refs/heads/master i:   111027:
 7521b56bd441fa179d48c63d87b3bd9162d2338d v: v3

---
 [refs]                          | 2 +-
 trunk/sound/soc/codecs/wm8731.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 3a2270aa01ab..41b1e6282bb1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7407a2e4b9e1fb3528bb355a571ee3eb7e32c386
+refs/heads/master: 8569be3cf90c279957bafd4e66f1332f041831d3
diff --git a/trunk/sound/soc/codecs/wm8731.c b/trunk/sound/soc/codecs/wm8731.c
index 975befdfd885..7b64d9a7ff76 100644
--- a/trunk/sound/soc/codecs/wm8731.c
+++ b/trunk/sound/soc/codecs/wm8731.c
@@ -688,12 +688,13 @@ static int wm8731_spi_write(struct spi_device *spi, const char *data, int len)
 {
 	struct spi_transfer t;
 	struct spi_message m;
-	u16 msg[2];
+	u8 msg[2];
 
 	if (len <= 0)
 		return 0;
 
-	msg[0] = (data[0] << 8) + data[1];
+	msg[0] = data[0];
+	msg[1] = data[1];
 
 	spi_message_init(&m);
 	memset(&t, 0, (sizeof t));