diff --git a/[refs] b/[refs] index ef3670b318b6..2ad2ad498daf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4401d138993c652dc7463207fa3afde71b7ae509 +refs/heads/master: b1eecf7e04f34e3248ca8d14e49156da63f05117 diff --git a/trunk/drivers/input/serio/hil_mlc.c b/trunk/drivers/input/serio/hil_mlc.c index 5704204964a3..ea499783fb12 100644 --- a/trunk/drivers/input/serio/hil_mlc.c +++ b/trunk/drivers/input/serio/hil_mlc.c @@ -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)); - if (down_trylock(&(mlc->isem))) BUG(); + BUG_ON(down_trylock(&(mlc->isem))); return; }