Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dda19a92 authored by Jonas Aaberg's avatar Jonas Aaberg Committed by Dmitry Torokhov
Browse files

Input: gpio_keys - disable hardware on suspend 



Disable hardware if active when suspending if the hw can not
wake the system from suspend.

[Dmitry Torokhov: use input_dev->users instead of a separate flag]

Signed-off-by: default avatarJonas Aaberg <jonas.aberg@stericsson.com>
Signed-off-by: default avatarPhilippe Langlais <philippe.langlais@linaro.org>
Reviewed-by: default avatarBengt Jonsson <bengt.g.jonsson@stericsson.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 5b76d7b4

drivers/input/keyboard/gpio_keys.c

+22 −5
Original line number Diff line number Diff line
@@ -803,6 +803,7 @@ static int gpio_keys_remove(struct platform_device *pdev) 
static int gpio_keys_suspend(struct device *dev)

{

	struct gpio_keys_drvdata *ddata = dev_get_drvdata(dev);

	struct input_dev *input = ddata->input;

	int i;



	if (device_may_wakeup(dev)) {
@@ -811,6 +812,11 @@ static int gpio_keys_suspend(struct device *dev) 
			if (bdata->button->wakeup)

				enable_irq_wake(bdata->irq);

		}

	} else {

		mutex_lock(&input->mutex);

		if (input->users)

			gpio_keys_close(input);

		mutex_unlock(&input->mutex);

	}



	return 0;
@@ -819,16 +825,27 @@ static int gpio_keys_suspend(struct device *dev) 
static int gpio_keys_resume(struct device *dev)

{

	struct gpio_keys_drvdata *ddata = dev_get_drvdata(dev);

	struct input_dev *input = ddata->input;

	int error = 0;

	int i;



	if (device_may_wakeup(dev)) {

		for (i = 0; i < ddata->pdata->nbuttons; i++) {

			struct gpio_button_data *bdata = &ddata->data[i];

		if (bdata->button->wakeup && device_may_wakeup(dev))

			if (bdata->button->wakeup)

				disable_irq_wake(bdata->irq);

		}

	} else {

		mutex_lock(&input->mutex);

		if (input->users)

			error = gpio_keys_open(input);

		mutex_unlock(&input->mutex);

	}



	gpio_keys_report_state(ddata);

	if (error)

		return error;



	gpio_keys_report_state(ddata);

	return 0;

}

#endif