diff --git a/[refs] b/[refs]
index 463a9c5be375..6c6903f02646 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8fbebb091a1695b8896597573c2d75831e41929a
+refs/heads/master: 19a177e6fb097c2a0dd94aeeb2805f0c04a4185f
diff --git a/trunk/drivers/staging/bcm/Bcmchar.c b/trunk/drivers/staging/bcm/Bcmchar.c
index 3b7c15039ee8..72a699c12704 100644
--- a/trunk/drivers/staging/bcm/Bcmchar.c
+++ b/trunk/drivers/staging/bcm/Bcmchar.c
@@ -860,6 +860,11 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 	}
 
 	case IOCTL_BCM_BUFFER_DOWNLOAD_STOP: {
+		if (!down_trylock(&Adapter->fw_download_sema)) {
+			up(&Adapter->fw_download_sema);
+			return -EINVAL;
+		}
+
 		if (down_trylock(&Adapter->NVMRdmWrmLock)) {
 			BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0,
 					"FW download blocked as EEPROM Read/Write is in progress\n");
@@ -867,11 +872,6 @@ static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg)
 			return -EACCES;
 		}
 
-		if (!down_trylock(&Adapter->fw_download_sema)) {
-			up(&Adapter->fw_download_sema);
-			return -EINVAL;
-		}
-
 		Adapter->bBinDownloaded = TRUE;
 		Adapter->bCfgDownloaded = TRUE;
 		atomic_set(&Adapter->CurrNumFreeTxDesc, 0);