From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: Fri, 22 Jan 2010 07:55:25 +0000 (-0800)
Subject: Merge commit 'v2.6.33-rc5' into next
X-Git-Tag: v2.6.34-rc1~236^2^2~38
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=7755726fe90a8b253659756e6de68c1a55aa427f;p=~emulex%2Finfiniband.git

Merge commit 'v2.6.33-rc5' into next
---

7755726fe90a8b253659756e6de68c1a55aa427f
diff --cc drivers/input/keyboard/atkbd.c
index 7c235013dba,7b4056292ea..326875be192
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
@@@ -1165,10 -1169,10 +1175,11 @@@ static int atkbd_reconnect(struct seri
  {
  	struct atkbd *atkbd = serio_get_drvdata(serio);
  	struct serio_driver *drv = serio->drv;
+ 	int retval = -1;
  
  	if (!atkbd || !drv) {
 -		printk(KERN_DEBUG "atkbd: reconnect request, but serio is disconnected, ignoring...\n");
 +		dev_dbg(&serio->dev,
 +			"reconnect request, but serio is disconnected, ignoring...\n");
  		return -1;
  	}
  
diff --cc drivers/input/serio/serio.c
index ee69ec399e0,e0f30186d51..c3b626e9eae
--- a/drivers/input/serio/serio.c
+++ b/drivers/input/serio/serio.c
@@@ -275,36 -284,32 +275,30 @@@ static void serio_handle_event(void
  
  	mutex_lock(&serio_mutex);
  
- 	/*
- 	 * Note that we handle only one event here to give swsusp
- 	 * a chance to freeze kseriod thread. Serio events should
- 	 * be pretty rare so we are not concerned about taking
- 	 * performance hit.
- 	 */
- 	if ((event = serio_get_event())) {
+ 	while ((event = serio_get_event())) {
  
  		switch (event->type) {
 -			case SERIO_REGISTER_PORT:
 -				serio_add_port(event->object);
 -				break;
  
 -			case SERIO_RECONNECT_PORT:
 -				serio_reconnect_port(event->object);
 -				break;
 +		case SERIO_REGISTER_PORT:
 +			serio_add_port(event->object);
 +			break;
  
 -			case SERIO_RESCAN_PORT:
 -				serio_disconnect_port(event->object);
 -				serio_find_driver(event->object);
 -				break;
 +		case SERIO_RECONNECT_PORT:
 +			serio_reconnect_port(event->object);
 +			break;
  
 -			case SERIO_RECONNECT_CHAIN:
 -				serio_reconnect_chain(event->object);
 -				break;
 +		case SERIO_RESCAN_PORT:
 +			serio_disconnect_port(event->object);
 +			serio_find_driver(event->object);
 +			break;
  
 -			case SERIO_ATTACH_DRIVER:
 -				serio_attach_driver(event->object);
 -				break;
 +		case SERIO_RECONNECT_CHAIN:
 +			serio_reconnect_chain(event->object);
 +			break;
  
 -			default:
 -				break;
 +		case SERIO_ATTACH_DRIVER:
 +			serio_attach_driver(event->object);
 +			break;
  		}
  
  		serio_remove_duplicate_events(event);