x86/smpboot: Init apic mapping before usage

[cascardo/linux.git] / net / bluetooth / leds.c

diff --git a/net/bluetooth/leds.c b/net/bluetooth/leds.c
index 8319c84..cb670b5 100644 (file)
--- a/net/bluetooth/leds.c
+++ b/net/bluetooth/leds.c
@@ -11,6 +11,8 @@
 
 #include "leds.h"
 
+DEFINE_LED_TRIGGER(bt_power_led_trigger);
+
 struct hci_basic_led_trigger {
        struct led_trigger      led_trigger;
        struct hci_dev          *hdev;
@@ -24,6 +26,21 @@ void hci_leds_update_powered(struct hci_dev *hdev, bool enabled)
        if (hdev->power_led)
                led_trigger_event(hdev->power_led,
                                  enabled ? LED_FULL : LED_OFF);
+
+       if (!enabled) {
+               struct hci_dev *d;
+
+               read_lock(&hci_dev_list_lock);
+
+               list_for_each_entry(d, &hci_dev_list, list) {
+                       if (test_bit(HCI_UP, &d->flags))
+                               enabled = true;
+               }
+
+               read_unlock(&hci_dev_list_lock);
+       }
+
+       led_trigger_event(bt_power_led_trigger, enabled ? LED_FULL : LED_OFF);
 }
 
 static void power_activate(struct led_classdev *led_cdev)
@@ -72,3 +89,13 @@ void hci_leds_init(struct hci_dev *hdev)
        /* initialize power_led */
        hdev->power_led = led_allocate_basic(hdev, power_activate, "power");
 }
+
+void bt_leds_init(void)
+{
+       led_trigger_register_simple("bluetooth-power", &bt_power_led_trigger);
+}
+
+void bt_leds_cleanup(void)
+{
+       led_trigger_unregister_simple(bt_power_led_trigger);
+}