nfsd4: consistent session flag setting

[safe/jmp/linux-2.6] / drivers / platform / x86 / msi-wmi.c

diff --git a/drivers/platform/x86/msi-wmi.c b/drivers/platform/x86/msi-wmi.c
index e25b80c..f5f70d4 100644 (file)
--- a/drivers/platform/x86/msi-wmi.c
+++ b/drivers/platform/x86/msi-wmi.c
@@ -34,16 +34,6 @@ MODULE_LICENSE("GPL");
 MODULE_ALIAS("wmi:551A1F84-FBDD-4125-91DB-3EA8F44F1D45");
 MODULE_ALIAS("wmi:B6F3EEF2-3D2F-49DC-9DE3-85BCE18C62F2");
 
-/* Temporary workaround until the WMI sysfs interface goes in
-               { "svn", DMI_SYS_VENDOR },
-               { "pn",  DMI_PRODUCT_NAME },
-               { "pvr", DMI_PRODUCT_VERSION },
-               { "rvn", DMI_BOARD_VENDOR },
-               { "rn",  DMI_BOARD_NAME },
-*/
-
-MODULE_ALIAS("dmi:*:svnMICRO-STARINTERNATIONAL*:pnMS-6638:*");
-
 #define DRV_NAME "msi-wmi"
 #define DRV_PFX DRV_NAME ": "
 
@@ -53,11 +43,15 @@ MODULE_ALIAS("dmi:*:svnMICRO-STARINTERNATIONAL*:pnMS-6638:*");
 #define dprintk(msg...) pr_debug(DRV_PFX msg)
 
 #define KEYCODE_BASE 0xD0
+#define MSI_WMI_BRIGHTNESSUP   KEYCODE_BASE
+#define MSI_WMI_BRIGHTNESSDOWN (KEYCODE_BASE + 1)
+#define MSI_WMI_VOLUMEUP       (KEYCODE_BASE + 2)
+#define MSI_WMI_VOLUMEDOWN     (KEYCODE_BASE + 3)
 static struct key_entry msi_wmi_keymap[] = {
-       { KE_KEY, KEYCODE_BASE,     {KEY_BRIGHTNESSUP} },
-       { KE_KEY, KEYCODE_BASE + 1, {KEY_BRIGHTNESSDOWN} },
-       { KE_KEY, KEYCODE_BASE + 2, {KEY_VOLUMEUP} },
-       { KE_KEY, KEYCODE_BASE + 3, {KEY_VOLUMEDOWN} },
+       { KE_KEY, MSI_WMI_BRIGHTNESSUP,   {KEY_BRIGHTNESSUP} },
+       { KE_KEY, MSI_WMI_BRIGHTNESSDOWN, {KEY_BRIGHTNESSDOWN} },
+       { KE_KEY, MSI_WMI_VOLUMEUP,       {KEY_VOLUMEUP} },
+       { KE_KEY, MSI_WMI_VOLUMEDOWN,     {KEY_VOLUMEDOWN} },
        { KE_END, 0}
 };
 static ktime_t last_pressed[ARRAY_SIZE(msi_wmi_keymap) - 1];
@@ -110,12 +104,14 @@ static int msi_wmi_set_block(int instance, int value)
 
 static int bl_get(struct backlight_device *bd)
 {
-       int level, err, ret = 0;
+       int level, err, ret;
 
        /* Instance 1 is "get backlight", cmp with DSDT */
        err = msi_wmi_query_block(1, &ret);
-       if (err)
+       if (err) {
                printk(KERN_ERR DRV_PFX "Could not query backlight: %d\n", err);
+               return -EINVAL;
+       }
        dprintk("Get: Query block returned: %d\n", ret);
        for (level = 0; level < ARRAY_SIZE(backlight_map); level++) {
                if (backlight_map[level] == ret) {
@@ -153,8 +149,13 @@ static void msi_wmi_notify(u32 value, void *context)
        static struct key_entry *key;
        union acpi_object *obj;
        ktime_t cur;
+       acpi_status status;
 
-       wmi_get_event_data(value, &response);
+       status = wmi_get_event_data(value, &response);
+       if (status != AE_OK) {
+               printk(KERN_INFO DRV_PFX "bad event status 0x%x\n", status);
+               return;
+       }
 
        obj = (union acpi_object *)response.pointer;
 
@@ -180,8 +181,9 @@ static void msi_wmi_notify(u32 value, void *context)
 
                        if (key->type == KE_KEY &&
                        /* Brightness is served via acpi video driver */
-                       (backlight || (key->keycode != KEY_BRIGHTNESSUP &&
-                       key->keycode != KEY_BRIGHTNESSDOWN))) {
+                       (!acpi_video_backlight_support() ||
+                       (key->code != MSI_WMI_BRIGHTNESSUP &&
+                       key->code != MSI_WMI_BRIGHTNESSDOWN))) {
                                dprintk("Send key: 0x%X - "
                                        "Input layer keycode: %d\n", key->code,
                                         key->keycode);
@@ -239,7 +241,7 @@ static int __init msi_wmi_init(void)
        }
        err = wmi_install_notify_handler(MSIWMI_EVENT_GUID,
                        msi_wmi_notify, NULL);
-       if (err)
+       if (ACPI_FAILURE(err))
                return -EINVAL;
 
        err = msi_wmi_input_setup();