Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / drivers / leds / leds-clevo-mail.c

diff --git a/drivers/leds/leds-clevo-mail.c b/drivers/leds/leds-clevo-mail.c
index 5750b08..f2242db 100644 (file)
--- a/drivers/leds/leds-clevo-mail.c
+++ b/drivers/leds/leds-clevo-mail.c
@@ -14,7 +14,7 @@
 #define CLEVO_MAIL_LED_BLINK_1HZ       0x008A
 #define CLEVO_MAIL_LED_BLINK_0_5HZ     0x0083
 
-MODULE_AUTHOR("Márton Németh <nm127@freemail.hu>");
+MODULE_AUTHOR("Márton Németh <nm127@freemail.hu>");
 MODULE_DESCRIPTION("Clevo mail LED driver");
 MODULE_LICENSE("GPL");
 
@@ -67,6 +67,16 @@ static struct dmi_system_id __initdata mail_led_whitelist[] = {
                        DMI_MATCH(DMI_PRODUCT_VERSION, "VT6198")
                }
        },
+       {
+               .callback = clevo_mail_led_dmi_callback,
+               .ident = "Clevo D400P",
+               .matches = {
+                       DMI_MATCH(DMI_BOARD_VENDOR, "Clevo"),
+                       DMI_MATCH(DMI_BOARD_NAME, "D400P"),
+                       DMI_MATCH(DMI_BOARD_VERSION, "Rev.A"),
+                       DMI_MATCH(DMI_PRODUCT_VERSION, "0106")
+               }
+       },
        {
                .callback = clevo_mail_led_dmi_callback,
                .ident = "Clevo D410V",
@@ -83,6 +93,8 @@ static struct dmi_system_id __initdata mail_led_whitelist[] = {
 static void clevo_mail_led_set(struct led_classdev *led_cdev,
                                enum led_brightness value)
 {
+       i8042_lock_chip();
+
        if (value == LED_OFF)
                i8042_command(NULL, CLEVO_MAIL_LED_OFF);
        else if (value <= LED_HALF)
@@ -90,14 +102,18 @@ static void clevo_mail_led_set(struct led_classdev *led_cdev,
        else
                i8042_command(NULL, CLEVO_MAIL_LED_BLINK_1HZ);
 
+       i8042_unlock_chip();
+
 }
 
 static int clevo_mail_led_blink(struct led_classdev *led_cdev,
-                               unsigned long* delay_on,
-                               unsigned long* delay_off)
+                               unsigned long *delay_on,
+                               unsigned long *delay_off)
 {
        int status = -EINVAL;
 
+       i8042_lock_chip();
+
        if (*delay_on == 0 /* ms */ && *delay_off == 0 /* ms */) {
                /* Special case: the leds subsystem requested us to
                 * chose one user friendly blinking of the LED, and
@@ -125,6 +141,8 @@ static int clevo_mail_led_blink(struct led_classdev *led_cdev,
                       *delay_on, *delay_off);
        }
 
+       i8042_unlock_chip();
+
        return status;
 }
 
@@ -132,6 +150,7 @@ static struct led_classdev clevo_mail_led = {
        .name                   = "clevo::mail",
        .brightness_set         = clevo_mail_led_set,
        .blink_set              = clevo_mail_led_blink,
+       .flags                  = LED_CORE_SUSPENDRESUME,
 };
 
 static int __init clevo_mail_led_probe(struct platform_device *pdev)
@@ -145,29 +164,9 @@ static int clevo_mail_led_remove(struct platform_device *pdev)
        return 0;
 }
 
-#ifdef CONFIG_PM
-static int clevo_mail_led_suspend(struct platform_device *dev,
-                                 pm_message_t state)
-{
-       led_classdev_suspend(&clevo_mail_led);
-       return 0;
-}
-
-static int clevo_mail_led_resume(struct platform_device *dev)
-{
-       led_classdev_resume(&clevo_mail_led);
-       return 0;
-}
-#else
-#define clevo_mail_led_suspend    NULL
-#define clevo_mail_led_resume     NULL
-#endif
-
 static struct platform_driver clevo_mail_led_driver = {
        .probe          = clevo_mail_led_probe,
        .remove         = clevo_mail_led_remove,
-       .suspend        = clevo_mail_led_suspend,
-       .resume         = clevo_mail_led_resume,
        .driver         = {
                .name           = KBUILD_MODNAME,
                .owner          = THIS_MODULE,