提交 20405c08 编写于 作者: M Michael Buesch 提交者: 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: NMichael Buesch <mb@bu3sch.de>
Acked-by: NIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 135900c1
......@@ -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;
......
......@@ -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[] = {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册