[kernel/f13/master] Revert commit 3d61510f4ecacfe47c75c0eb51c0659dfa77fb1b from 2.6.34.2 (#625758)

[Chuck Ebbert]

commit e6201b52160a05c4cc3136f13c816c67618c9c84
Author: Chuck Ebbert <cebbert at redhat.com>
Date:   Tue Aug 24 15:36:21 2010 -0400

    Revert commit 3d61510f4ecacfe47c75c0eb51c0659dfa77fb1b from 2.6.34.2 (#625758)

 kernel.spec                      |    4 +++
 linux-2.6-upstream-reverts.patch |   55 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 0 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 256fdb3..825a103 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2040,6 +2040,10 @@ fi
 
 
 %changelog
+* Mon Aug 24 2010 Chuck Ebbert <cebbert at redhat.com> 2.6.34.5-45
+- Revert commit 3d61510f4ecacfe47c75c0eb51c0659dfa77fb1b from 2.6.34.2;
+  it causes dropped keystrokes (#625758)
+
 * Mon Aug 23 2010 Ben Skeggs <bskeggs at redhat.com> 2.6.34.5-44
 - nouveau: fix eDP panels that flip HPD during link training (rhbz#596562)
 
diff --git a/linux-2.6-upstream-reverts.patch b/linux-2.6-upstream-reverts.patch
index 600fb93..71d57f7 100644
--- a/linux-2.6-upstream-reverts.patch
+++ b/linux-2.6-upstream-reverts.patch
@@ -1,3 +1,58 @@
+From 3d61510f4ecacfe47c75c0eb51c0659dfa77fb1b Mon Sep 17 00:00:00 2001
+From: Alan Stern <stern at rowland.harvard.edu>
+Date: Fri, 2 Apr 2010 13:21:58 -0400
+Subject: HID: usbhid: enable remote wakeup for keyboards
+
+From: Alan Stern <stern at rowland.harvard.edu>
+
+commit 3d61510f4ecacfe47c75c0eb51c0659dfa77fb1b upstream.
+
+This patch (as1365) enables remote wakeup by default for USB keyboard
+devices.  Keyboards in general are supposed to be wakeup devices, but
+the correct place to enable it depends on the device's bus; no single
+approach will work for all keyboard devices.  In particular, this
+covers only USB keyboards (and then only those supporting the boot
+protocol).
+
+Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
+Signed-off-by: Jiri Kosina <jkosina at suse.cz>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+---
+ drivers/hid/usbhid/hid-core.c |    7 +++++--
+ drivers/hid/usbhid/usbkbd.c   |    1 +
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+--- a/drivers/hid/usbhid/hid-core.c
++++ b/drivers/hid/usbhid/hid-core.c
+@@ -1019,12 +1019,15 @@ static int usbhid_start(struct hid_devic
+ 	/* Some keyboards don't work until their LEDs have been set.
+ 	 * Since BIOSes do set the LEDs, it must be safe for any device
+ 	 * that supports the keyboard boot protocol.
++	 * In addition, enable remote wakeup by default for all keyboard
++	 * devices supporting the boot protocol.
+ 	 */
+ 	if (interface->desc.bInterfaceSubClass == USB_INTERFACE_SUBCLASS_BOOT &&
+ 			interface->desc.bInterfaceProtocol ==
+-				USB_INTERFACE_PROTOCOL_KEYBOARD)
++				USB_INTERFACE_PROTOCOL_KEYBOARD) {
+ 		usbhid_set_leds(hid);
+-
++		device_set_wakeup_enable(&dev->dev, 1);
++	}
+ 	return 0;
+ 
+ fail:
+--- a/drivers/hid/usbhid/usbkbd.c
++++ b/drivers/hid/usbhid/usbkbd.c
+@@ -313,6 +313,7 @@ static int usb_kbd_probe(struct usb_inte
+ 		goto fail2;
+ 
+ 	usb_set_intfdata(iface, kbd);
++	device_set_wakeup_enable(&dev->dev, 1);
+ 	return 0;
+ 
+ fail2:	
 From 468f0b44ce4b002ca7d9260f802a341854752c02 Mon Sep 17 00:00:00 2001
 From: Chris Wilson <chris at chris-wilson.co.uk>
 Date: Thu, 27 May 2010 13:18:13 +0100