diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-07 00:52:00 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-07 00:52:00 +0100 |
| commit | ca409d6e08c35b01965d9211c61dbd216286f8ff (patch) | |
| tree | 2bb4d7edbbbc98839426b6c08ed762288427b012 /net | |
| parent | net: Fix recursive descent in __scm_destroy(). (diff) | |
| parent | iwl3945: fix deadlock on suspend (diff) | |
| download | linux-ca409d6e08c35b01965d9211c61dbd216286f8ff.tar.xz linux-ca409d6e08c35b01965d9211c61dbd216286f8ff.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net')
| -rw-r--r-- | net/rfkill/rfkill.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rfkill/rfkill.c b/net/rfkill/rfkill.c index f949a482b007..25ba3bd57e66 100644 --- a/net/rfkill/rfkill.c +++ b/net/rfkill/rfkill.c @@ -603,7 +603,7 @@ static int rfkill_check_duplicity(const struct rfkill *rfkill) } /* 0: first switch of its kind */ - return test_bit(rfkill->type, seen); + return (test_bit(rfkill->type, seen)) ? 1 : 0; } static int rfkill_add_switch(struct rfkill *rfkill) |