+ dell-studio-1555-eject-key-does-not-work-small-patch-to-fix-included.patch added to -mm tree

[akpm@linux-foundation.org]

The patch titled
     drivers/platform/x86/dell-wmi.c: fix Dell Studio 1555 eject key
has been added to the -mm tree.  Its filename is
     dell-studio-1555-eject-key-does-not-work-small-patch-to-fix-included.patch

Before you just go and hit "reply", please:
   a) Consider who else should be cc'ed
   b) Prefer to cc a suitable mailing list as well
   c) Ideally: find the original patch on the mailing list and do a
      reply-to-all to that, adding suitable additional cc's

*** Remember to use Documentation/SubmitChecklist when testing your code ***

See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: drivers/platform/x86/dell-wmi.c: fix Dell Studio 1555 eject key
From: Islam Amer <pharon@gmail.com>

Pressing the eject key on my Dell Studio 1555 does not work and dmesg
produces this message :

dell-wmi: Unknown key 0 pressed

Adding a debugging printk in dell-wmi.c after line 222 like this :

printk(KERN_INFO "dell:wmi 0x%x , 0x%x \n", buffer_entry[1], buffer_entry[2]);

dmesg now shows :

dell:wmi 0x0 , 0xe009
dell-wmi: Unknown key 0 pressed

So for some reason buffer_entry[1] is used although it is empty.

Falling back to buffer_entry[2] in case buffer_entry[1] is 0x0 makes the
button work.

I suspect it might be better to fix the "dell_new_hk_type" logic though

Addresses https://bugzilla.kernel.org/show_bug.cgi?id=16075

Cc: Matthew Garrett <mjg@redhat.com>
Cc: Len Brown <lenb@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/platform/x86/dell-wmi.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN drivers/platform/x86/dell-wmi.c~dell-studio-1555-eject-key-does-not-work-small-patch-to-fix-included drivers/platform/x86/dell-wmi.c
--- a/drivers/platform/x86/dell-wmi.c~dell-studio-1555-eject-key-does-not-work-small-patch-to-fix-included
+++ a/drivers/platform/x86/dell-wmi.c
@@ -221,7 +221,7 @@ static void dell_wmi_notify(u32 value, v
 			return;
 		}
 
-		if (dell_new_hk_type)
+		if (dell_new_hk_type || buffer_entry[1] == 0x0)
 			reported_key = (int)buffer_entry[2];
 		else
 			reported_key = (int)buffer_entry[1] & 0xffff;
_

Patches currently in -mm which might be from pharon@gmail.com are

dell-studio-1555-eject-key-does-not-work-small-patch-to-fix-included.patch