projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into upstream
[powerpc.git]
/
drivers
/
input
/
serio
/
hil_mlc.c
diff --git
a/drivers/input/serio/hil_mlc.c
b/drivers/input/serio/hil_mlc.c
index
73aa8df
..
bbbe15e
100644
(file)
--- 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) {
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;
}