Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[RFKILL]: Add support for hardware-only rfkill buttons

Browse source 
Buttons that work directly on hardware cannot support
the "user_claim" functionality. Add a flag to signal
this and return -EOPNOTSUPP in this case.
b43 is such a device.

Signed-off-by: Michael Buesch <mb@bu3sch.de>
Acked-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Michael Buesch 2007-09-27 21:34:23 +02:00 committed by David S. Miller
parent 135900c182
commit 20405c0841
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/linux/rfkill.h
View file

@ -52,6 +52,8 @@ enum rfkill_state {
* @type: Radio type which the button controls, the value stored
* here should be a value from enum rfkill_type.
* @state: State of the switch (on/off).
* @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
* @data: Pointer to the RF button drivers private data which will be
@ -69,6 +71,7 @@ struct rfkill {
enum rfkill_type type;
enum rfkill_state state;
bool user_claim_unsupported;
bool user_claim;
struct mutex mutex;

7
net/rfkill/rfkill.c
View file

@ -190,6 +190,10 @@ static ssize_t rfkill_claim_store(struct device *dev,
if (error)
return error;
if (rfkill->user_claim_unsupported) {
error = -EOPNOTSUPP;
goto out_unlock;
}
if (rfkill->user_claim != claim) {
if (!claim)
rfkill_toggle_radio(rfkill,
@ -197,9 +201,10 @@ static ssize_t rfkill_claim_store(struct device *dev,
rfkill->user_claim = claim;
}
out_unlock:
mutex_unlock(&rfkill_mutex);
return count;
return error ? error : count;
}
static struct device_attribute rfkill_dev_attrs[] = {