diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-08-06 21:42:33 +0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-08-06 21:42:33 +0400 |
| commit | 00dd7b7d26a3bf3780cfcebfdde2b86126b3a082 (patch) | |
| tree | 5129fd1abc99d0c58a520938f28bf330ae94ef30 /drivers/input/serio/libps2.c | |
| parent | 58b3ac07fed31ffc1349380b78305af6522fe1f4 (diff) | |
| parent | 6e1e63259b1e01f047796e7985d960ca040993e6 (diff) | |
| download | linux-00dd7b7d26a3bf3780cfcebfdde2b86126b3a082.tar.xz | |
Merge ../linux-2.6
Conflicts:
arch/ia64/hp/sim/simscsi.c
Stylistic differences in two separate fixes for buffer->request_buffer
problem.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/input/serio/libps2.c')
| -rw-r--r-- | drivers/input/serio/libps2.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/input/serio/libps2.c b/drivers/input/serio/libps2.c index 61a6f977846f..ed202f2f251a 100644 --- a/drivers/input/serio/libps2.c +++ b/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); |