diff options
author | James Morris <jmorris@namei.org> | 2010-03-30 21:39:27 (GMT) |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2010-03-30 21:39:27 (GMT) |
commit | d25d6fa1a95f465ff1ec4458ca15e30b2c8dffec (patch) | |
tree | 7362b182dedd825fc762ef7706830837e42943af /drivers/staging/vt6655/card.c | |
parent | 225a9be24d799aa16d543c31fb09f0c9ed1d9caa (diff) | |
parent | 2eaa9cfdf33b8d7fb7aff27792192e0019ae8fc6 (diff) | |
download | linux-fsl-qoriq-d25d6fa1a95f465ff1ec4458ca15e30b2c8dffec.tar.xz |
Merge branch 'master' into next
Diffstat (limited to 'drivers/staging/vt6655/card.c')
-rw-r--r-- | drivers/staging/vt6655/card.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/staging/vt6655/card.c b/drivers/staging/vt6655/card.c index db78614..bf4fd49 100644 --- a/drivers/staging/vt6655/card.c +++ b/drivers/staging/vt6655/card.c @@ -2788,16 +2788,18 @@ void CARDvUpdateBasicTopRate (PVOID pDeviceHandler) //Determines the highest basic rate. for (ii = RATE_54M; ii >= RATE_6M; ii --) { - if ( (pDevice->wBasicRate) & ((WORD)(1<<ii)) ) + if ( (pDevice->wBasicRate) & ((WORD)(1<<ii)) ) { byTopOFDM = ii; break; + } } pDevice->byTopOFDMBasicRate = byTopOFDM; for (ii = RATE_11M;; ii --) { - if ( (pDevice->wBasicRate) & ((WORD)(1<<ii)) ) + if ( (pDevice->wBasicRate) & ((WORD)(1<<ii)) ) { byTopCCK = ii; break; + } if (ii == RATE_1M) break; } |