diff --git a/[refs] b/[refs]
index 1d43c1c3b05b..a95990d0053e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f05321cca53da7c7abad4bc726699e9f27bf4922
+refs/heads/master: 2e3161390130f50fdbb4b989c667f42e5008107f
diff --git a/trunk/drivers/staging/bcm/Misc.c b/trunk/drivers/staging/bcm/Misc.c
index 023c511c0001..9588fbe101d9 100644
--- a/trunk/drivers/staging/bcm/Misc.c
+++ b/trunk/drivers/staging/bcm/Misc.c
@@ -1079,7 +1079,7 @@ int run_card_proc(PMINI_ADAPTER ps_adapter )
 int InitCardAndDownloadFirmware(PMINI_ADAPTER ps_adapter)
 {
 
-	UINT status = STATUS_SUCCESS;
+	int status;
 	UINT value = 0;
 	/*
  	 * Create the threads first and then download the