diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-08-09 12:46:45 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-08-09 12:46:49 +0200 |
| commit | e3560336be655c6791316482fe288b119f34c427 (patch) | |
| tree | 43ca9a6b489aaa3918b773f78a7eda37458ef0a8 /drivers/input/serio/hp_sdc_mlc.c | |
| parent | 26528e773ecc74fb1b61b7275f86f761cbb340ec (diff) | |
| parent | 7b2aa037e878c939676675969983284a02958ae3 (diff) | |
Merge branch 'linus' into tracing/urgent
Merge reason: Merge up to almost-rc6 to pick up latest perfcounters
(on which we'll queue up a dependent fix)
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/input/serio/hp_sdc_mlc.c')
| -rw-r--r-- | drivers/input/serio/hp_sdc_mlc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/serio/hp_sdc_mlc.c b/drivers/input/serio/hp_sdc_mlc.c index b587e2d576a..820e51673b2 100644 --- 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); |