From 687eeca74941171ef36473639c0ad955ab40d730 Mon Sep 17 00:00:00 2001
From: Kalle Valo <kalle.valo@nokia.com>
Date: Fri, 12 Jun 2009 14:14:28 +0300
Subject: [PATCH] --- yaml --- r: 158789 b: refs/heads/master c:
 1d3b8130611bbe50168ad0a12841735c9c235410 h: refs/heads/master i:   158787:
 ab7c14cd3db7220836f0fad5738a6ff520396508 v: v3

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

diff --git a/[refs] b/[refs]
index 3150b2859dff..0e5d6b5c25a6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff25839bf0c99e828c26864a24417a36a6b6a31e
+refs/heads/master: 1d3b8130611bbe50168ad0a12841735c9c235410
diff --git a/trunk/drivers/net/wireless/wl12xx/spi.h b/trunk/drivers/net/wireless/wl12xx/spi.h
index fd3227e904a8..f3f18958657c 100644
--- a/trunk/drivers/net/wireless/wl12xx/spi.h
+++ b/trunk/drivers/net/wireless/wl12xx/spi.h
@@ -94,16 +94,15 @@ void wl12xx_set_partition(struct wl12xx *wl,
 
 static inline u32 wl12xx_read32(struct wl12xx *wl, int addr)
 {
-	u32 response;
+	wl12xx_spi_read(wl, addr, &wl->buffer_32, sizeof(wl->buffer_32));
 
-	wl12xx_spi_read(wl, addr, &response, sizeof(u32));
-
-	return response;
+	return wl->buffer_32;
 }
 
 static inline void wl12xx_write32(struct wl12xx *wl, int addr, u32 val)
 {
-	wl12xx_spi_write(wl, addr, &val, sizeof(u32));
+	wl->buffer_32 = val;
+	wl12xx_spi_write(wl, addr, &wl->buffer_32, sizeof(wl->buffer_32));
 }
 
 #endif /* __WL12XX_SPI_H__ */
diff --git a/trunk/drivers/net/wireless/wl12xx/wl12xx.h b/trunk/drivers/net/wireless/wl12xx/wl12xx.h
index 48641437414b..f252a1189254 100644
--- a/trunk/drivers/net/wireless/wl12xx/wl12xx.h
+++ b/trunk/drivers/net/wireless/wl12xx/wl12xx.h
@@ -382,6 +382,8 @@ struct wl12xx {
 
 	struct wl12xx_stats stats;
 	struct wl12xx_debugfs debugfs;
+
+	u32 buffer_32;
 };
 
 int wl12xx_plt_start(struct wl12xx *wl);