diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-11 03:40:18 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-11 03:40:18 -0500 |
| commit | e0cb4ebcd9e5b4ddd8216c20f54445c91b1fa4b9 (patch) | |
| tree | d1c3b22b7e9f02fb56927da530da09c6ee7ce0b9 /net/rfkill | |
| parent | a309720c876d7ad2e224bfd1982c92ae4364c82e (diff) | |
| parent | 45b86a96f17cb2900f291129b0e67287400e45b2 (diff) | |
Merge branch 'tracing/urgent' into tracing/ftrace
Conflicts:
kernel/trace/trace.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 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) | |||
| 603 | } | 603 | } |
| 604 | 604 | ||
| 605 | /* 0: first switch of its kind */ | 605 | /* 0: first switch of its kind */ |
| 606 | return test_bit(rfkill->type, seen); | 606 | return (test_bit(rfkill->type, seen)) ? 1 : 0; |
| 607 | } | 607 | } |
| 608 | 608 | ||
| 609 | static int rfkill_add_switch(struct rfkill *rfkill) | 609 | static int rfkill_add_switch(struct rfkill *rfkill) |