Commit 20405c08 authored by Michael Buesch's avatar Michael Buesch Committed by David S. Miller

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

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: default avatarMichael Buesch <mb@bu3sch.de>
Acked-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 135900c1
...@@ -52,6 +52,8 @@ enum rfkill_state { ...@@ -52,6 +52,8 @@ enum rfkill_state {
* @type: Radio type which the button controls, the value stored * @type: Radio type which the button controls, the value stored
* here should be a value from enum rfkill_type. * here should be a value from enum rfkill_type.
* @state: State of the switch (on/off). * @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. * @user_claim: Set when the switch is controlled exlusively by userspace.
* @mutex: Guards switch state transitions * @mutex: Guards switch state transitions
* @data: Pointer to the RF button drivers private data which will be * @data: Pointer to the RF button drivers private data which will be
...@@ -69,6 +71,7 @@ struct rfkill { ...@@ -69,6 +71,7 @@ struct rfkill {
enum rfkill_type type; enum rfkill_type type;
enum rfkill_state state; enum rfkill_state state;
bool user_claim_unsupported;
bool user_claim; bool user_claim;
struct mutex mutex; struct mutex mutex;
......
...@@ -190,6 +190,10 @@ static ssize_t rfkill_claim_store(struct device *dev, ...@@ -190,6 +190,10 @@ static ssize_t rfkill_claim_store(struct device *dev,
if (error) if (error)
return error; return error;
if (rfkill->user_claim_unsupported) {
error = -EOPNOTSUPP;
goto out_unlock;
}
if (rfkill->user_claim != claim) { if (rfkill->user_claim != claim) {
if (!claim) if (!claim)
rfkill_toggle_radio(rfkill, rfkill_toggle_radio(rfkill,
...@@ -197,9 +201,10 @@ static ssize_t rfkill_claim_store(struct device *dev, ...@@ -197,9 +201,10 @@ static ssize_t rfkill_claim_store(struct device *dev,
rfkill->user_claim = claim; rfkill->user_claim = claim;
} }
out_unlock:
mutex_unlock(&rfkill_mutex); mutex_unlock(&rfkill_mutex);
return count; return error ? error : count;
} }
static struct device_attribute rfkill_dev_attrs[] = { static struct device_attribute rfkill_dev_attrs[] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment