From 9d0d504d4688dbdb6a1ddc9d466038ebb8bb805c Mon Sep 17 00:00:00 2001
From: Kalle Valo <kalle.valo@nokia.com>
Date: Fri, 12 Jun 2009 14:14:55 +0300
Subject: [PATCH] --- yaml --- r: 158793 b: refs/heads/master c:
 5262c12d16334a37354c93d606bdb96499f7e5fc h: refs/heads/master i:   158791:
 ce5c119d8267f2b0c63d1b0999794bdef9de696f v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/net/wireless/wl12xx/spi.c    | 5 +++--
 trunk/drivers/net/wireless/wl12xx/spi.h    | 3 +--
 trunk/drivers/net/wireless/wl12xx/wl12xx.h | 2 ++
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index e6255dbeafc0..49a9c6eafcc2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 56343a3cfdea4d341c7c13d26013024037eae602
+refs/heads/master: 5262c12d16334a37354c93d606bdb96499f7e5fc
diff --git a/trunk/drivers/net/wireless/wl12xx/spi.c b/trunk/drivers/net/wireless/wl12xx/spi.c
index 939274291a07..bcdcfbca77b3 100644
--- a/trunk/drivers/net/wireless/wl12xx/spi.c
+++ b/trunk/drivers/net/wireless/wl12xx/spi.c
@@ -262,10 +262,11 @@ void wl12xx_spi_read(struct wl12xx *wl, int addr, void *buf,
 {
 	struct spi_transfer t[3];
 	struct spi_message m;
-	char busy_buf[TNETWIF_READ_OFFSET_BYTES];
+	u8 *busy_buf;
 	u32 *cmd;
 
 	cmd = &wl->buffer_cmd;
+	busy_buf = wl->buffer_busyword;
 
 	*cmd = 0;
 	*cmd |= WSPI_CMD_READ;
@@ -281,7 +282,7 @@ void wl12xx_spi_read(struct wl12xx *wl, int addr, void *buf,
 
 	/* Busy and non busy words read */
 	t[1].rx_buf = busy_buf;
-	t[1].len = TNETWIF_READ_OFFSET_BYTES;
+	t[1].len = WL12XX_BUSY_WORD_LEN;
 	spi_message_add_tail(&t[1], &m);
 
 	t[2].rx_buf = buf;
diff --git a/trunk/drivers/net/wireless/wl12xx/spi.h b/trunk/drivers/net/wireless/wl12xx/spi.h
index 7edb218ee76c..1a19557b0b42 100644
--- a/trunk/drivers/net/wireless/wl12xx/spi.h
+++ b/trunk/drivers/net/wireless/wl12xx/spi.h
@@ -65,9 +65,8 @@
 
 #define WSPI_INIT_CMD_LEN           8
 
-#define TNETWIF_READ_OFFSET_BYTES  8
 #define HW_ACCESS_WSPI_FIXED_BUSY_LEN \
-		((TNETWIF_READ_OFFSET_BYTES - 4) / sizeof(u32))
+		((WL12XX_BUSY_WORD_LEN - 4) / sizeof(u32))
 #define HW_ACCESS_WSPI_INIT_CMD_MASK  0
 
 
diff --git a/trunk/drivers/net/wireless/wl12xx/wl12xx.h b/trunk/drivers/net/wireless/wl12xx/wl12xx.h
index 586593563511..b81102098c7d 100644
--- a/trunk/drivers/net/wireless/wl12xx/wl12xx.h
+++ b/trunk/drivers/net/wireless/wl12xx/wl12xx.h
@@ -105,6 +105,7 @@ enum {
 				  CFG_RX_AUTH_EN |  \
 				  CFG_RX_ASSOC_EN)
 
+#define WL12XX_BUSY_WORD_LEN 8
 
 struct boot_attr {
 	u32 radio_type;
@@ -385,6 +386,7 @@ struct wl12xx {
 
 	u32 buffer_32;
 	u32 buffer_cmd;
+	u8 buffer_busyword[WL12XX_BUSY_WORD_LEN];
 };
 
 int wl12xx_plt_start(struct wl12xx *wl);