s/state/blocked
Signed-off-by: Fabian Frederick <[email protected]>
---
net/rfkill/core.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/rfkill/core.c b/net/rfkill/core.c
index b3b16c0..fa7cd79 100644
--- a/net/rfkill/core.c
+++ b/net/rfkill/core.c
@@ -329,7 +329,7 @@ static atomic_t rfkill_input_disabled = ATOMIC_INIT(0);
/**
* __rfkill_switch_all - Toggle state of all switches of given type
* @type: type of interfaces to be affected
- * @state: the new state
+ * @blocked: the new state
*
* This function sets the state of all switches of given type,
* unless a specific switch is claimed by userspace (in which case,
@@ -353,7 +353,7 @@ static void __rfkill_switch_all(const enum rfkill_type type, bool blocked)
/**
* rfkill_switch_all - Toggle state of all switches of given type
* @type: type of interfaces to be affected
- * @state: the new state
+ * @blocked: the new state
*
* Acquires rfkill_global_mutex and calls __rfkill_switch_all(@type, @state).
* Please refer to __rfkill_switch_all() for details.
--
1.9.3
On Thu, Oct 09, 2014 at 11:16:53AM +0200, Johannes Berg wrote:
> Applied, with a somewhat better changelog.
FWIW, I had already merged that one as-is -- sorry!
--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.
Applied, with a somewhat better changelog.
johannes
On Thu, 2014-10-09 at 11:33 -0400, John W. Linville wrote:
> On Thu, Oct 09, 2014 at 11:16:53AM +0200, Johannes Berg wrote:
> > Applied, with a somewhat better changelog.
>
> FWIW, I had already merged that one as-is -- sorry!
Hmm? That can't be right - then I shouldn't have been able to apply it?
I think you're thinking of another rfkill patch: "net: rfkill: gpio: Fix
clock status"?
johannes