X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=drivers%2Finput%2Fserio%2Flibps2.c;h=79c97f94bcbd5e9bcc31168020c3b7f1f0c32106;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=b9f5d99fad040ff437bc74f617f1d8caeb3f0a87;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/drivers/input/serio/libps2.c b/drivers/input/serio/libps2.c
index b9f5d99fa..79c97f94b 100644
--- a/drivers/input/serio/libps2.c
+++ b/drivers/input/serio/libps2.c
@@ -177,11 +177,6 @@ int ps2_command(struct ps2dev *ps2dev, unsigned char *param, int command)
 		return -1;
 	}
 
-	if (send && !param) {
-		WARN_ON(1);
-		return -1;
-	}
-
 	mutex_lock(&ps2dev->cmd_mutex);
 
 	serio_pause_rx(ps2dev->serio);
@@ -280,8 +275,6 @@ int ps2_schedule_command(struct ps2dev *ps2dev, unsigned char *param, int comman
 	return 0;
 }
 
-static struct lock_class_key ps2_mutex_key;
-
 /*
  * ps2_init() initializes ps2dev structure
  */
@@ -289,8 +282,6 @@ static struct lock_class_key ps2_mutex_key;
 void ps2_init(struct ps2dev *ps2dev, struct serio *serio)
 {
 	mutex_init(&ps2dev->cmd_mutex);
-	lockdep_set_class_and_subclass(&ps2dev->cmd_mutex, &ps2_mutex_key,
-				       serio->depth);
 	init_waitqueue_head(&ps2dev->wait);
 	ps2dev->serio = serio;
 }