]> git.karo-electronics.de Git - linux-beck.git/commitdiff
power: reset: ltc2952: check trigger value before starting timer
authorFrans Klaver <frans.klaver@xsens.com>
Wed, 14 Jan 2015 08:15:44 +0000 (09:15 +0100)
committerSebastian Reichel <sre@kernel.org>
Tue, 20 Jan 2015 12:58:30 +0000 (13:58 +0100)
In ltc2952_poweroff_handler it is theoretically possible that the timer
fails to start on first pass (button press), but succeeds in starting on
the second (button release). This will cause the button press to be
misinterpreted, and will incorrectly shut down the system. Because a
picture says more than a thousand words:

Expected behavior:
tmr:      ++++++++++
btn: -----__________-----

Faulty behavior:
tmr:                +++++
btn: -----__________-----

Legend:
+ timer runs
_ button pressed
- button depressed

To prevent this from happening, check the value of the gpio before
starting the timer. If the button is active, we should start the timer,
else we should stop it.

The situation described can now still occur if the polarity of the input
pin is set incorrectly, but that at least is predictable behavior and
can be detected during the first tests.

Signed-off-by: Frans Klaver <frans.klaver@xsens.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
drivers/power/reset/ltc2952-poweroff.c

index 240b294a098049397c0cd6244d2cec3548b17923..b99bc251f5b476a78dfe7120e25f176872114484 100644 (file)
@@ -160,7 +160,7 @@ static irqreturn_t ltc2952_poweroff_handler(int irq, void *dev_id)
                return IRQ_HANDLED;
        }
 
-       if (!hrtimer_active(&data->timer_trigger)) {
+       if (gpiod_get_value(data->gpio_trigger)) {
                if (hrtimer_start(&data->timer_trigger, data->trigger_delay,
                                  HRTIMER_MODE_REL))
                        dev_err(data->dev, "unable to start the wait timer\n");