diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-02 00:08:05 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-02 00:08:05 -0500 |
| commit | 95d465fd750897ab32462a6702fbfe1b122cbbc0 (patch) | |
| tree | 65c38b2f11c51bb6932e44dd6c92f15b0091abfe /drivers/input/serio/hil_mlc.c | |
| parent | 642fde17dceceb56c7ba2762733ac688666ae657 (diff) | |
| parent | 683aa4012f53b2ada0f430487e05d37b0d94e90a (diff) | |
Manual merge with Linus.
Conflicts:
arch/powerpc/kernel/setup-common.c
drivers/input/keyboard/hil_kbd.c
drivers/input/mouse/hil_ptr.c
Diffstat (limited to 'drivers/input/serio/hil_mlc.c')
| -rw-r--r-- | drivers/input/serio/hil_mlc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/serio/hil_mlc.c b/drivers/input/serio/hil_mlc.c index 73aa8df84bc..bbbe15e2190 100644 --- a/drivers/input/serio/hil_mlc.c +++ b/drivers/input/serio/hil_mlc.c | |||
| @@ -556,7 +556,7 @@ static inline void hilse_setup_input(hil_mlc *mlc, struct hilse_node *node) { | |||
| 556 | do_gettimeofday(&(mlc->instart)); | 556 | do_gettimeofday(&(mlc->instart)); |
| 557 | mlc->icount = 15; | 557 | mlc->icount = 15; |
| 558 | memset(mlc->ipacket, 0, 16 * sizeof(hil_packet)); | 558 | memset(mlc->ipacket, 0, 16 * sizeof(hil_packet)); |
| 559 | if (down_trylock(&(mlc->isem))) BUG(); | 559 | BUG_ON(down_trylock(&(mlc->isem))); |
| 560 | 560 | ||
| 561 | return; | 561 | return; |
| 562 | } | 562 | } |