[kernel/f13/master] Add support for eject key on Dell laptops (#513530)

[Chuck Ebbert]

commit 7898ca3d1b01097e2bf06f6f730262485fe76187
Author: Chuck Ebbert <cebbert at redhat.com>
Date:   Fri Sep 3 07:53:46 2010 -0400

    Add support for eject key on Dell laptops (#513530)

 dell-wmi-add-support-for-eject-key.patch |   29 +++++++++++++++++++++++++++++
 kernel.spec                              |   10 +++++++++-
 2 files changed, 38 insertions(+), 1 deletions(-)
---
diff --git a/dell-wmi-add-support-for-eject-key.patch b/dell-wmi-add-support-for-eject-key.patch
new file mode 100644
index 0000000..f806196
--- /dev/null
+++ b/dell-wmi-add-support-for-eject-key.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 8162e47..2c8de29 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -48,7 +48,7 @@ Summary: The Linux kernel
 # reset this by hand to 1 (or to 0 and then use rpmdev-bumpspec).
 # scripts/rebase.sh should be made to do that for you, actually.
 #
-%global baserelease 49
+%global baserelease 50
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -766,6 +766,7 @@ Patch12460: xfs-move-aio-completion-after-unwritten-extent-conversion.patch
 
 Patch12470: drivers-hwmon-coretemp-c-detect-the-thermal-sensors-by-cpuid.patch
 Patch12480: kprobes-x86-fix-kprobes-to-skip-prefixes-correctly.patch
+Patch12490: dell-wmi-add-support-for-eject-key.patch
 
 %endif
 
@@ -1426,6 +1427,9 @@ ApplyPatch drivers-hwmon-coretemp-c-detect-the-thermal-sensors-by-cpuid.patch
 # bz #610941
 ApplyPatch kprobes-x86-fix-kprobes-to-skip-prefixes-correctly.patch
 
+# bz #513530
+ApplyPatch dell-wmi-add-support-for-eject-key.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2047,6 +2051,10 @@ fi
 
 
 %changelog
+* Fri Sep 03 2010 Chuck Ebbert <cebbert at redhat.com>  2.6.34.6-50
+- Re-enable I2O, but only for 32-bit x86 (#629676)
+- Add support for eject key on Dell laptops (#513530)
+
 * Thu Sep 02 2010 Dave Airlie <airlied at redhat.com> 2.6.34.6-49
 - fix radeon suspend/resume issues and two other minor patches