diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-07 01:43:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-07 01:43:03 -0500 |
| commit | 9eeda9abd1faf489f3df9a1f557975f4c8650363 (patch) | |
| tree | 3e0a58e25b776cfbee193195460324dccb1886c7 /net/rfkill | |
| parent | 61c9eaf90081cbe6dc4f389e0056bff76eca19ec (diff) | |
| parent | 4bab0ea1d42dd1927af9df6fbf0003fc00617c50 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath5k/base.c
net/8021q/vlan_core.c
Diffstat (limited to 'net/rfkill')
| -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 c9180c8771c6..69f3a3b4dd61 100644 --- a/net/rfkill/rfkill.c +++ b/net/rfkill/rfkill.c | |||
| @@ -666,7 +666,7 @@ static int rfkill_check_duplicity(const struct rfkill *rfkill) | |||
| 666 | } | 666 | } |
| 667 | 667 | ||
| 668 | /* 0: first switch of its kind */ | 668 | /* 0: first switch of its kind */ |
| 669 | return test_bit(rfkill->type, seen); | 669 | return (test_bit(rfkill->type, seen)) ? 1 : 0; |
| 670 | } | 670 | } |
| 671 | 671 | ||
| 672 | static int rfkill_add_switch(struct rfkill *rfkill) | 672 | static int rfkill_add_switch(struct rfkill *rfkill) |