diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-26 00:16:16 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-26 00:16:16 +0400 |
| commit | db4148da2cc84c31419b5e3ae3115ac6e11817a1 (patch) | |
| tree | 72d7d99cd7a4903e017169e0ae8e2b37027129c6 /drivers/net/wireless/rt2x00/rt61pci.c | |
| parent | ef40a685311bef053dedd833a72dffaf25669dda (diff) | |
| parent | 8d09a5e1c36d0dec5728e6c8b0bb5412de09b27b (diff) | |
| download | linux-db4148da2cc84c31419b5e3ae3115ac6e11817a1.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt61pci.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt61pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c index 2c36b91ff4c7..a461620b489f 100644 --- a/drivers/net/wireless/rt2x00/rt61pci.c +++ b/drivers/net/wireless/rt2x00/rt61pci.c @@ -381,7 +381,7 @@ static int rt61pci_config_shared_key(struct rt2x00_dev *rt2x00dev, if (reg && reg == mask) return -ENOSPC; - key->hw_key_idx += reg ? (ffz(reg) - 1) : 0; + key->hw_key_idx += reg ? ffz(reg) : 0; /* * Upload key to hardware @@ -477,7 +477,7 @@ static int rt61pci_config_pairwise_key(struct rt2x00_dev *rt2x00dev, return -ENOSPC; } - key->hw_key_idx += reg ? (ffz(reg) - 1) : 0; + key->hw_key_idx += reg ? ffz(reg) : 0; /* * Upload key to hardware |