> On Thu, Nov 22, 2012 at 01:23:36PM +0000, Lee Jones wrote:
> > From: Jonas Aaberg <jonas.ab...@stericsson.com>
> >
> > Disable hardware if active when suspending if the hw can not
> > wake the system from suspend.
>
> How about below instead (needs the other patch I have just sent out)?
Sorry Dmitry, I'm a little confused. What does this mean?
> Input: gpio-keys - disable hardware on suspend
>
> From: Jonas Aaberg <jonas.ab...@stericsson.com>
>
> Disable hardware if active when suspending if the hw can not
> wake the system from suspend.
>
> Signed-off-by: Jonas Aaberg <jonas.ab...@stericsson.com>
> Signed-off-by: Philippe Langlais <philippe.langl...@linaro.org>
> Reviewed-by: Bengt Jonsson <bengt.g.jons...@stericsson.com>
> Signed-off-by: Lee Jones <lee.jo...@linaro.org>
> Signed-off-by: Dmitry Torokhov <dmitry.torok...@gmail.com>
> ---
> drivers/input/keyboard/gpio_keys.c | 27 ++++++++++++++++++++++-----
> 1 file changed, 22 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/input/keyboard/gpio_keys.c
> b/drivers/input/keyboard/gpio_keys.c
> index c7764ca..79435de 100644
> --- a/drivers/input/keyboard/gpio_keys.c
> +++ b/drivers/input/keyboard/gpio_keys.c
> @@ -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;
>
> - for (i = 0; i < ddata->pdata->nbuttons; i++) {
> - struct gpio_button_data *bdata = &ddata->data[i];
> - if (bdata->button->wakeup && device_may_wakeup(dev))
> - disable_irq_wake(bdata->irq);
> + 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)
> + 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
--
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
