---

yaml --- r: 281170 b: refs/heads/master c: 19a177e h: refs/heads/master v: v3
git-mirror · Nov 29, 2011 · e263a9c · e263a9c
1 parent 462972d
commit e263a9c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -860,18 +860,18 @@ 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");
 			up(&Adapter->fw_download_sema);
 			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);