[1/1] LEDS: leds-input, fix sleep inside atomic

Commit Message

Jiri Slaby June 5, 2010, 9:12 p.m. UTC

None

Patch

diff --git a/drivers/leds/leds-input.c b/drivers/leds/leds-input.c
index 93ab5ae..794155a 100644
--- a/drivers/leds/leds-input.c
+++ b/drivers/leds/leds-input.c
@@ -92,7 +92,7 @@  static struct led_trigger input_led_triggers[LED_CNT] = {
 	DEFINE_INPUT_LED_TRIGGER(LED_CHARGING, "charging"),
 };
 /* Lock for registration coherency */
-static DEFINE_SPINLOCK(input_led_registered_lock);
+static DEFINE_MUTEX(input_led_registered_lock);
 /* Which global LED classes and triggers are registered */
 static unsigned long input_led_registered[BITS_TO_LONGS(LED_CNT)];
 
@@ -159,7 +159,6 @@  static int input_led_connect(struct input_handler *handler,
 {
 	struct input_handle *handle;
 	int i, error = 0;
-	unsigned long flags;
 	struct led_classdev *leds;
 
 	if (!test_bit(EV_LED, dev->keybit))
@@ -187,7 +186,7 @@  static int input_led_connect(struct input_handler *handler,
 		goto err;
 
 	/* lazily register missing global input LEDs */
-	spin_lock_irqsave(&input_led_registered_lock, flags);
+	mutex_lock(&input_led_registered_lock);
 	for (i = 0; i < LED_CNT; i++)
 		if (input_leds[i].name
 				&& !test_bit(i, input_led_registered)
@@ -199,7 +198,7 @@  static int input_led_connect(struct input_handler *handler,
 			else
 				led_trigger_unregister(&input_led_triggers[i]);
 		}
-	spin_unlock_irqrestore(&input_led_registered_lock, flags);
+	mutex_unlock(&input_led_registered_lock);
 
 	/* and register this device's LEDs */
 	for (i = 0; i < LED_CNT; i++)
@@ -239,7 +238,6 @@  err:
 static void input_led_disconnect(struct input_handle *handle)
 {
 	int unregister, i;
-	unsigned long flags;
 	struct led_classdev *leds = handle->private;
 
 	for (i = 0; i < LED_CNT; i++)
@@ -249,7 +247,7 @@  static void input_led_disconnect(struct input_handle *handle)
 	input_unregister_handle(handle);
 	input_led_delete_handle(handle);
 
-	spin_lock_irqsave(&input_led_registered_lock, flags);
+	mutex_lock(&input_led_registered_lock);
 	for (i = 0; i < LED_CNT; i++) {
 		if (!test_bit(i, input_led_registered))
 			continue;
@@ -268,7 +266,7 @@  static void input_led_disconnect(struct input_handle *handle)
 		led_trigger_unregister(&input_led_triggers[i]);
 		clear_bit(i, input_led_registered);
 	}
-	spin_unlock_irqrestore(&input_led_registered_lock, flags);
+	mutex_unlock(&input_led_registered_lock);
 }
 
 /* Only handle input devices which have LEDs */