[kernel/f14/master] add in f13 patch to fix eject key on dell studio 1555

[Kyle McMartin]

commit 426c30b2f1288770b9ad986d4ab219fae2cf4002
Author: Kyle McMartin <kyle at dreadnought.i.jkkm.org>
Date:   Mon Sep 6 15:17:29 2010 -0400

    add in f13 patch to fix eject key on dell studio 1555

 ...wmi-add-support-for-eject-key-studio-1555.patch |   29 ++++++++++++++++++++
 kernel.spec                                        |   10 +++++++
 2 files changed, 39 insertions(+), 0 deletions(-)
---
diff --git a/dell-wmi-add-support-for-eject-key-studio-1555.patch b/dell-wmi-add-support-for-eject-key-studio-1555.patch
new file mode 100644
index 0000000..f806196
--- /dev/null
+++ b/dell-wmi-add-support-for-eject-key-studio-1555.patch
@@ -0,0 +1,29 @@
+From: Islam Amer <pharon at gmail.com>
+Date: Thu, 24 Jun 2010 17:39:47 +0000 (-0400)
+Subject: dell-wmi: Add support for eject key on Dell Studio 1555
+X-Git-Tag: v2.6.36-rc1~579^2~64
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=d5164dbf1f651d1e955b158fb70a9c844cc91cd1
+
+dell-wmi: Add support for eject key on Dell Studio 1555
+
+Fixes pressing the eject key on Dell Studio 1555 does not work and produces
+message :
+
+dell-wmi: Unknown key 0 pressed
+
+Signed-off-by: Islam Amer <pharon at gmail.com>
+---
+
+diff --git a/drivers/platform/x86/dell-wmi.c b/drivers/platform/x86/dell-wmi.c
+index 66f53c3..12a8e6f 100644
+--- a/drivers/platform/x86/dell-wmi.c
++++ b/drivers/platform/x86/dell-wmi.c
+@@ -221,7 +221,7 @@ static void dell_wmi_notify(u32 value, void *context)
+ 			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;
diff --git a/kernel.spec b/kernel.spec
index d4445c6..cafb935 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -715,6 +715,9 @@ Patch12080: kprobes-x86-fix-kprobes-to-skip-prefixes-correctly.patch
 # rhbz #622149
 Patch12085: fix-rcu_deref_check-warning.patch
 
+# rhbz #513530
+Patch12090: dell-wmi-add-support-for-eject-key-studio-1555.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1320,6 +1323,9 @@ ApplyPatch kprobes-x86-fix-kprobes-to-skip-prefixes-correctly.patch
 # bz 622149
 ApplyPatch fix-rcu_deref_check-warning.patch
 
+# bz 513530
+ApplyPatch dell-wmi-add-support-for-eject-key-studio-1555.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1907,6 +1913,10 @@ fi
 
 %changelog
 * Mon Sep 06 2010 Kyle McMartin <kyle at redhat.com>
+- Suck in patch from F-13 to add support for the eject key on the
+  Dell Studio 1555. (#513530)
+
+* Mon Sep 06 2010 Kyle McMartin <kyle at redhat.com>
 - Patch from paulmck to fix rcu_dereference_check warning
   (http://lkml.org/lkml/2010/8/16/258)