From 54a9329a46e0e7dfb3ab05c6baae6e349673d128 Mon Sep 17 00:00:00 2001
From: Roland Vossen <rvossen@broadcom.com>
Date: Tue, 4 Oct 2011 23:19:12 +0200
Subject: [PATCH] --- yaml --- r: 268713 b: refs/heads/master c:
 d0f5527d3949db767425dc84f0e8547824b74708 h: refs/heads/master i:   268711:
 cb60072497a8d85186e6d75bf1ee0bd625b651ed v: v3

---
 [refs]                                                  | 2 +-
 trunk/drivers/staging/brcm80211/brcmsmac/mac80211_if.c  | 4 ++--
 trunk/drivers/staging/brcm80211/brcmsmac/ucode_loader.h | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 6bc8460ee36b..35165372371b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8be00d98f167b95fac8886d60f9942ef0c744445
+refs/heads/master: d0f5527d3949db767425dc84f0e8547824b74708
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/mac80211_if.c b/trunk/drivers/staging/brcm80211/brcmsmac/mac80211_if.c
index fa00ab31fab5..ac78052b4955 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/mac80211_if.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/mac80211_if.c
@@ -1606,7 +1606,7 @@ int brcms_ucode_init_buf(struct brcms_info *wl, void **pbuf, u32 idx)
  * Precondition: Since this function is called in brcms_pci_probe() context,
  * no locking is required.
  */
-int brcms_ucode_init_uint(struct brcms_info *wl, u32 *data, u32 idx)
+int brcms_ucode_init_uint(struct brcms_info *wl, size_t *n_bytes, u32 idx)
 {
 	int i, entry;
 	const u8 *pdata;
@@ -1623,7 +1623,7 @@ int brcms_ucode_init_uint(struct brcms_info *wl, u32 *data, u32 idx)
 						  "ERROR: fw hdr len\n");
 					return -ENOMSG;
 				}
-				*data = le32_to_cpu(*((__le32 *) pdata));
+				*n_bytes = le32_to_cpu(*((__le32 *) pdata));
 				return 0;
 			}
 		}
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/ucode_loader.h b/trunk/drivers/staging/brcm80211/brcmsmac/ucode_loader.h
index 49d5b7e9a4ec..18750a814b4f 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/ucode_loader.h
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/ucode_loader.h
@@ -50,8 +50,8 @@ extern void brcms_ucode_data_free(struct brcms_ucode *ucode);
 
 extern int brcms_ucode_init_buf(struct brcms_info *wl, void **pbuf,
 				unsigned int idx);
-extern int brcms_ucode_init_uint(struct brcms_info *wl, unsigned *data,
-			      unsigned int idx);
+extern int brcms_ucode_init_uint(struct brcms_info *wl, size_t *n_bytes,
+				 unsigned int idx);
 extern void brcms_ucode_free_buf(void *);
 extern int  brcms_check_firmwares(struct brcms_info *wl);