---

yaml --- r: 220032 b: refs/heads/master c: eb7f37b h: refs/heads/master v: v3
git-mirror · Oct 5, 2010 · e0a7fc4 · e0a7fc4
1 parent 43665b2
commit e0a7fc4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b229fad289ad36a5875c7e4f9a8e736b27d8bef4
+refs/heads/master: eb7f37b3d56839fc0c3b631146f8b3be96b71879
diff --git a/trunk/drivers/staging/brcm80211/util/sbutils.c b/trunk/drivers/staging/brcm80211/util/sbutils.c
@@ -543,7 +543,8 @@ void sb_core_reset(si_t *sih, uint32 bits, uint32 resetbits)
 	if (R_SBREG(sii, &sb->sbtmstatehigh) & SBTMH_SERR)
 		W_SBREG(sii, &sb->sbtmstatehigh, 0);
 
-	if ((dummy = R_SBREG(sii, &sb->sbimstate)) & (SBIM_IBE | SBIM_TO))
+	dummy = R_SBREG(sii, &sb->sbimstate);
+	if (dummy & (SBIM_IBE | SBIM_TO))
 		AND_SBREG(sii, &sb->sbimstate, ~(SBIM_IBE | SBIM_TO));
 
 	/* clear reset and allow it to propagate throughout the core */