git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/oss' into for-linus
[pandora-kernel.git]
/
drivers
/
input
/
serio
/
hp_sdc_mlc.c
diff --git
a/drivers/input/serio/hp_sdc_mlc.c
b/drivers/input/serio/hp_sdc_mlc.c
index
b587e2d
..
820e516
100644
(file)
--- a/
drivers/input/serio/hp_sdc_mlc.c
+++ b/
drivers/input/serio/hp_sdc_mlc.c
@@
-296,7
+296,7
@@
static void hp_sdc_mlc_out(hil_mlc *mlc)
priv->tseq[3] = 0;
if (mlc->opacket & HIL_CTRL_APE) {
priv->tseq[3] |= HP_SDC_LPC_APE_IPF;
-
down_trylock(&mlc->csem
);
+
BUG_ON(down_trylock(&mlc->csem)
);
}
enqueue:
hp_sdc_enqueue_transaction(&priv->trans);