From d2eb46b7f33dbe490085706ea5ae6c0c59878b75 Mon Sep 17 00:00:00 2001
From: Roland Vossen <rvossen@broadcom.com>
Date: Tue, 23 Aug 2011 14:13:58 +0200
Subject: [PATCH] --- yaml --- r: 267504 b: refs/heads/master c:
 49d468f64d59016030c2835a423833e7b45ccce5 h: refs/heads/master v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/staging/brcm80211/brcmsmac/main.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 444007a327ea..4ba0207966eb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 183eeb985a2cdbf37c7850c5e8e99cc1cc26901f
+refs/heads/master: 49d468f64d59016030c2835a423833e7b45ccce5
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/main.c b/trunk/drivers/staging/brcm80211/brcmsmac/main.c
index c625c2556aed..7e729d295d73 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/main.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/main.c
@@ -6111,9 +6111,12 @@ _brcms_c_ioctl(struct brcms_c_info *wlc, int cmd, void *arg, int len,
 	/* default argument is generic integer */
 	pval = arg ? (int *)arg : NULL;
 
-	/* This will prevent the misaligned access */
+	/*
+	 * This will prevent misaligned access. The (void *) cast prevents a
+	 * memcpy alignment issue on e.g. Sparc64 platforms.
+	 */
 	if (pval && (u32) len >= sizeof(val))
-		memcpy(&val, pval, sizeof(val));
+		memcpy((void *)&val, (void *)pval, sizeof(val));
 	else
 		val = 0;