linux-kernel - Re: [PATCH v5 6/7] Input: pixcir_i2c

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Sun, 18 May 2014 22:55:55 -0700
From:	Dmitry Torokhov <dmitry.torokhov@...il.com>
To:	Roger Quadros <rogerq@...com>
Cc:	rydberg@...omail.se, balbi@...com, dmurphy@...com,
	mugunthanvnm@...com, nsekhar@...com, linux-input@...r.kernel.org,
	linux-kernel@...r.kernel.org, devicetree@...r.kernel.org
Subject: Re: [PATCH v5 6/7] Input: pixcir_i2c_ts: Implement wakeup from
 suspend

On Tue, May 06, 2014 at 02:06:11PM +0300, Roger Quadros wrote:
> Improve the suspend and resume handlers to allow the device
> to wakeup the system from suspend.
> 
> Signed-off-by: Roger Quadros <rogerq@...com>
> Acked-by: Mugunthan V N <mugunthanvnm@...com>

Applied, thank you.

> ---
>  drivers/input/touchscreen/pixcir_i2c_ts.c | 47 ++++++++++++++++++++++++++++---
>  1 file changed, 43 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/input/touchscreen/pixcir_i2c_ts.c b/drivers/input/touchscreen/pixcir_i2c_ts.c
> index 0728c04..b0f7680 100644
> --- a/drivers/input/touchscreen/pixcir_i2c_ts.c
> +++ b/drivers/input/touchscreen/pixcir_i2c_ts.c
> @@ -348,21 +348,59 @@ static void pixcir_input_close(struct input_dev *dev)
>  static int pixcir_i2c_ts_suspend(struct device *dev)
>  {
>  	struct i2c_client *client = to_i2c_client(dev);
> +	struct pixcir_i2c_ts_data *ts = i2c_get_clientdata(client);
> +	struct input_dev *input = ts->input;
> +	int ret = 0;
> +
> +	mutex_lock(&input->mutex);
> +
> +	if (device_may_wakeup(&client->dev)) {
> +		if (!input->users) {
> +			ret = pixcir_start(ts);
> +			if (ret) {
> +				dev_err(dev, "Failed to start\n");
> +				goto unlock;
> +			}
> +		}
>  
> -	if (device_may_wakeup(&client->dev))
>  		enable_irq_wake(client->irq);
> +	} else if (input->users) {
> +		ret = pixcir_stop(ts);
> +	}
>  
> -	return 0;
> +unlock:
> +	mutex_unlock(&input->mutex);
> +
> +	return ret;
>  }
>  
>  static int pixcir_i2c_ts_resume(struct device *dev)
>  {
>  	struct i2c_client *client = to_i2c_client(dev);
> +	struct pixcir_i2c_ts_data *ts = i2c_get_clientdata(client);
> +	struct input_dev *input = ts->input;
> +	int ret = 0;
> +
> +	mutex_lock(&input->mutex);
>  
> -	if (device_may_wakeup(&client->dev))
> +	if (device_may_wakeup(&client->dev)) {
>  		disable_irq_wake(client->irq);
>  
> -	return 0;
> +		if (!input->users) {
> +			ret = pixcir_stop(ts);
> +			if (ret) {
> +				dev_err(dev, "Failed to stop\n");
> +				goto unlock;
> +			}
> +		}
> +	} else if (input->users) {
> +		ret = pixcir_start(ts);
> +	}
> +
> +unlock:
> +	mutex_unlock(&input->mutex);
> +
> +	return ret;
>  }
>  #endif
>  
> @@ -469,6 +507,7 @@ static int pixcir_i2c_ts_probe(struct i2c_client *client,
>  	if (error)
>  		return error;
>  
> +	i2c_set_clientdata(client, tsdata);
>  	device_init_wakeup(&client->dev, 1);
>  
>  	return 0;
> -- 
> 1.8.3.2
> 

-- 
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/