From 0941987a9cd00270ca02955c8d923d113d8899ed Mon Sep 17 00:00:00 2001
From: Eric Sesterhenn <snakebyte@gmx.de>
Date: Fri, 24 Mar 2006 18:37:43 +0100
Subject: [PATCH] --- yaml --- r: 23679 b: refs/heads/master c:
 b1eecf7e04f34e3248ca8d14e49156da63f05117 h: refs/heads/master i:   23677:
 a3e3d7d7941e3ea7f168734a8b4f02a82aa81325   23675:
 412a2c420b71f76162157ee5fd6d3a973a444013   23671:
 9562274e09242e8fba93910f5376a47c53560596   23663:
 a2a1f74d131eebd0f34eb1cc605161f0dd77a4f6   23647:
 c5c412c73d6ef6c1599faecac9a0cefbcb7e9039   23615:
 8fdc46c7428fa1ae4b3cf4425daa7a9e5e8f89c3   23551:
 b06c5bab229e268a77341e9c392c10394ce5f177 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/input/serio/hil_mlc.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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;
 }