From a2a9ef1201fa586638f0423886b96288b855562f Mon Sep 17 00:00:00 2001 From: Eric Sesterhenn Date: Sun, 26 Mar 2006 18:23:47 +0200 Subject: [PATCH] --- yaml --- r: 24207 b: refs/heads/master c: fddaaae16ba4d9f4d392a9ef94616d9d22485571 h: refs/heads/master i: 24205: 990cdaf6901f8c49235e3bfaef5d95fdf4babe12 24203: ab9f122acdbea4308f4294434b897d84bcaf82a9 24199: dbfc070e641d19eaac8851e1ac859ccd954ef426 24191: ab7fad164301b72b9de80dd006fedf96d3e7df5c v: v3 --- [refs] | 2 +- trunk/drivers/input/serio/hp_sdc_mlc.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2d2992cda425..694b30b5149a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 547bc92649345af6014578a64b27cc5787617935 +refs/heads/master: fddaaae16ba4d9f4d392a9ef94616d9d22485571 diff --git a/trunk/drivers/input/serio/hp_sdc_mlc.c b/trunk/drivers/input/serio/hp_sdc_mlc.c index 1c9426fd5205..aa4a8a4ccfdb 100644 --- a/trunk/drivers/input/serio/hp_sdc_mlc.c +++ b/trunk/drivers/input/serio/hp_sdc_mlc.c @@ -270,9 +270,10 @@ static void hp_sdc_mlc_out (hil_mlc *mlc) { do_control: priv->emtestmode = mlc->opacket & HIL_CTRL_TEST; - if ((mlc->opacket & (HIL_CTRL_APE | HIL_CTRL_IPF)) == HIL_CTRL_APE) { - BUG(); /* we cannot emulate this, it should not be used. */ - } + + /* we cannot emulate this, it should not be used. */ + BUG_ON((mlc->opacket & (HIL_CTRL_APE | HIL_CTRL_IPF)) == HIL_CTRL_APE); + if ((mlc->opacket & HIL_CTRL_ONLY) == HIL_CTRL_ONLY) goto control_only; if (mlc->opacket & HIL_CTRL_APE) { BUG(); /* Should not send command/data after engaging APE */