diff options
author | John W. Linville <linville@tuxdriver.com> | 2012-08-23 09:49:42 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-08-23 09:49:42 -0400 |
commit | a4881cc45a3fab4488e16c4934e149cfa620f1a9 (patch) | |
tree | 653eaec2c015a52ba17b4e1b714251b9472925ec /net/rfkill/core.c | |
parent | 6de3f7e911d27d6737c79b3f6b5069044ea408ec (diff) | |
parent | aba4e6fff8de0c92e53f0e7ef077231e75f7d760 (diff) |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'net/rfkill/core.c')
-rw-r--r-- | net/rfkill/core.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/net/rfkill/core.c b/net/rfkill/core.c index 752b72360ebc..c275bad12068 100644 --- a/net/rfkill/core.c +++ b/net/rfkill/core.c | |||
@@ -150,6 +150,20 @@ static void rfkill_led_trigger_activate(struct led_classdev *led) | |||
150 | rfkill_led_trigger_event(rfkill); | 150 | rfkill_led_trigger_event(rfkill); |
151 | } | 151 | } |
152 | 152 | ||
153 | const char *rfkill_get_led_trigger_name(struct rfkill *rfkill) | ||
154 | { | ||
155 | return rfkill->led_trigger.name; | ||
156 | } | ||
157 | EXPORT_SYMBOL(rfkill_get_led_trigger_name); | ||
158 | |||
159 | void rfkill_set_led_trigger_name(struct rfkill *rfkill, const char *name) | ||
160 | { | ||
161 | BUG_ON(!rfkill); | ||
162 | |||
163 | rfkill->ledtrigname = name; | ||
164 | } | ||
165 | EXPORT_SYMBOL(rfkill_set_led_trigger_name); | ||
166 | |||
153 | static int rfkill_led_trigger_register(struct rfkill *rfkill) | 167 | static int rfkill_led_trigger_register(struct rfkill *rfkill) |
154 | { | 168 | { |
155 | rfkill->led_trigger.name = rfkill->ledtrigname | 169 | rfkill->led_trigger.name = rfkill->ledtrigname |