From 39203b7b5052e2969d784e8e6f9eb2623fe04fb4 Mon Sep 17 00:00:00 2001
From: Kevin McKinney <klmckinney1@gmail.com>
Date: Tue, 27 Sep 2011 21:28:11 -0400
Subject: [PATCH] --- yaml --- r: 268555 b: refs/heads/master c:
 2505aa6ce42a686b2d3db95ccdcc7bc100e7b8c0 h: refs/heads/master i:   268553:
 6c31b8f6fa4bbfdc5d20a7567f6e71ab28f161de   268551:
 6a6a23595a3d12c160ccd75fa66c9ebfadcc4456 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/staging/bcm/Bcmchar.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 597d8ab7a4c0..9e6636567d87 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a2cc4977ffd551b58ae20c646bd7083ba5a89d2
+refs/heads/master: 2505aa6ce42a686b2d3db95ccdcc7bc100e7b8c0
diff --git a/trunk/drivers/staging/bcm/Bcmchar.c b/trunk/drivers/staging/bcm/Bcmchar.c
index 867c65c4375d..2fa658eb74dc 100644
--- a/trunk/drivers/staging/bcm/Bcmchar.c
+++ b/trunk/drivers/staging/bcm/Bcmchar.c
@@ -205,6 +205,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 		RDM_BUFFER  sRdmBuffer = {0};
 		PCHAR temp_buff;
 		UINT Bufflen;
+		u16 temp_value;
 
 		/* Copy Ioctl Buffer structure */
 		if (copy_from_user(&IoBuffer, argp, sizeof(IOCTL_BUFFER)))
@@ -221,7 +222,10 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 			return -EINVAL;
 		}
 
-		Bufflen = IoBuffer.OutputLength + (4 - IoBuffer.OutputLength%4)%4;
+		Bufflen = IoBuffer.OutputLength;
+		temp_value = 4 - (Bufflen % 4);
+		Bufflen += temp_value % 4;
+
 		temp_buff = kmalloc(Bufflen, GFP_KERNEL);
 		if (!temp_buff)
 			return -ENOMEM;