git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
drivers
/
input
/
serio
/
libps2.c
diff --git
a/drivers/input/serio/libps2.c
b/drivers/input/serio/libps2.c
index
b9f5d99
..
79c97f9
100644
(file)
--- 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;
}
return -1;
}
- if (send && !param) {
- WARN_ON(1);
- return -1;
- }
-
mutex_lock(&ps2dev->cmd_mutex);
serio_pause_rx(ps2dev->serio);
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;
}
return 0;
}
-static struct lock_class_key ps2_mutex_key;
-
/*
* ps2_init() initializes ps2dev structure
*/
/*
* 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);
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;
}
init_waitqueue_head(&ps2dev->wait);
ps2dev->serio = serio;
}