From 867e7ddfefd6a943779e92c0ec9c0eac0e671c55 Mon Sep 17 00:00:00 2001 From: Henrique de Moraes Holschuh Date: Mon, 21 Jul 2008 21:18:19 -0300 Subject: [PATCH] --- yaml --- r: 107086 b: refs/heads/master c: f1b23361a0f15497d4c6795a2935b2e98064ddfb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/rfkill.h | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index ff636aee7111..7f9c36cbed72 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 37f55e9d78d1b63047b1b7ae175cdce650547ba8 +refs/heads/master: f1b23361a0f15497d4c6795a2935b2e98064ddfb diff --git a/trunk/include/linux/rfkill.h b/trunk/include/linux/rfkill.h index c5f6e54ec6ae..741d1a62cc3f 100644 --- a/trunk/include/linux/rfkill.h +++ b/trunk/include/linux/rfkill.h @@ -68,7 +68,8 @@ enum rfkill_state { * @user_claim_unsupported: Whether the hardware supports exclusive * RF-kill control by userspace. Set this before registering. * @user_claim: Set when the switch is controlled exlusively by userspace. - * @mutex: Guards switch state transitions + * @mutex: Guards switch state transitions. It serializes callbacks + * and also protects the state. * @data: Pointer to the RF button drivers private data which will be * passed along when toggling radio state. * @toggle_radio(): Mandatory handler to control state of the radio. @@ -89,12 +90,13 @@ struct rfkill { const char *name; enum rfkill_type type; - enum rfkill_state state; bool user_claim_unsupported; bool user_claim; + /* the mutex serializes callbacks and also protects + * the state */ struct mutex mutex; - + enum rfkill_state state; void *data; int (*toggle_radio)(void *data, enum rfkill_state state); int (*get_state)(void *data, enum rfkill_state *state);