From e2e99189db3e77b81ae82c0a104541f2025f433e Mon Sep 17 00:00:00 2001
From: Kevin McKinney <klmckinney1@gmail.com>
Date: Thu, 1 Dec 2011 22:02:15 -0500
Subject: [PATCH] --- yaml --- r: 281302 b: refs/heads/master c:
 09468b0392b1d2b079b334d60a23d7da8105dc53 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index f90118b36ab6..2a6e1fc8a571 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c6fb5fc050a4430363d92994132fffa6776c9d4
+refs/heads/master: 09468b0392b1d2b079b334d60a23d7da8105dc53
diff --git a/trunk/drivers/staging/bcm/Bcmchar.c b/trunk/drivers/staging/bcm/Bcmchar.c
index 72a699c12704..ad1cc5598dca 100644
--- a/trunk/drivers/staging/bcm/Bcmchar.c
+++ b/trunk/drivers/staging/bcm/Bcmchar.c
@@ -1336,7 +1336,7 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 
 			if (copy_to_user(stNVMReadWrite.pBuffer, pReadData, stNVMReadWrite.uiNumBytes)) {
 				kfree(pReadData);
-				Status = -EFAULT;
+				return -EFAULT;
 			}
 		} else {
 			down(&Adapter->NVMRdmWrmLock);