From e0a7fc482d27398882b8a53c2935e455c6792935 Mon Sep 17 00:00:00 2001 From: Jason Cooper Date: Thu, 30 Sep 2010 15:15:34 -0400 Subject: [PATCH] --- yaml --- r: 220032 b: refs/heads/master c: eb7f37b3d56839fc0c3b631146f8b3be96b71879 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/brcm80211/util/sbutils.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f466550d8e9c..41f3d47f4b64 100644 --- 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 index 0bb487146a77..7de5838564ac 100644 --- 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 */