Manual merge with Linus.
[linux-2.6.git] / drivers / input / serio / hil_mlc.c
index 73aa8df84bcd1c44c72c32365138c370ea304b97..bbbe15e219044fb6f9aadbcc60795f90ddc74d17 100644 (file)
@@ -556,7 +556,7 @@ static inline void hilse_setup_input(hil_mlc *mlc, struct hilse_node *node) {
        do_gettimeofday(&(mlc->instart));
        mlc->icount = 15;
        memset(mlc->ipacket, 0, 16 * sizeof(hil_packet));
        do_gettimeofday(&(mlc->instart));
        mlc->icount = 15;
        memset(mlc->ipacket, 0, 16 * sizeof(hil_packet));
-       if (down_trylock(&(mlc->isem))) BUG();
+       BUG_ON(down_trylock(&(mlc->isem)));
 
        return;
 }
 
        return;
 }