From 1796710921e125e5f819e43b7004625142aace5d Mon Sep 17 00:00:00 2001
From: Dmitry Torokhov <dtor@insightbb.com>
Date: Thu, 6 Jul 2006 23:54:48 -0400
Subject: [PATCH] --- yaml --- r: 33183 b: refs/heads/master c:
 95349fe8144b7d18f04bdca1c2d3fb85789de4fb h: refs/heads/master i:   33181:
 dced69fdf94ec75daa592663bffda1397669aee8   33179:
 f3793df3fdb2f7d7a8c7d60f3ea029d041c6dffe   33175:
 e9417afc333b4b2bdcb02d8edfbc3b326ee6709c   33167:
 c14a2cf7cacab5a63a6b4092839ca96441eb0a31   33151:
 018dfd931f6280da5e86115a6bef2d8c3b50e14b v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/input/serio/libps2.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1bec53fcfd2c..63e53c046627 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 699756199d65700e8deed59ae250439ca8684686
+refs/heads/master: 95349fe8144b7d18f04bdca1c2d3fb85789de4fb
diff --git a/trunk/drivers/input/serio/libps2.c b/trunk/drivers/input/serio/libps2.c
index 61a6f977846f..ed202f2f251a 100644
--- a/trunk/drivers/input/serio/libps2.c
+++ b/trunk/drivers/input/serio/libps2.c
@@ -177,6 +177,11 @@ int ps2_command(struct ps2dev *ps2dev, unsigned char *param, int command)
 		return -1;
 	}
 
+	if (send && !param) {
+		WARN_ON(1);
+		return -1;
+	}
+
 	mutex_lock_nested(&ps2dev->cmd_mutex, SINGLE_DEPTH_NESTING);
 
 	serio_pause_rx(ps2dev->serio);