Merge tag 'hyperv-next-signed-20201214' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / drivers / input / touchscreen / pixcir_i2c_ts.c

diff --git a/drivers/input/touchscreen/pixcir_i2c_ts.c b/drivers/input/touchscreen/pixcir_i2c_ts.c
index 9aa0985..dc148b4 100644 (file)
--- a/drivers/input/touchscreen/pixcir_i2c_ts.c
+++ b/drivers/input/touchscreen/pixcir_i2c_ts.c
@@ -415,14 +415,14 @@ static int __maybe_unused pixcir_i2c_ts_suspend(struct device *dev)
        mutex_lock(&input->mutex);
 
        if (device_may_wakeup(&client->dev)) {
-               if (!input->users) {
+               if (!input_device_enabled(input)) {
                        ret = pixcir_start(ts);
                        if (ret) {
                                dev_err(dev, "Failed to start\n");
                                goto unlock;
                        }
                }
-       } else if (input->users) {
+       } else if (input_device_enabled(input)) {
                ret = pixcir_stop(ts);
        }
 
@@ -442,14 +442,14 @@ static int __maybe_unused pixcir_i2c_ts_resume(struct device *dev)
        mutex_lock(&input->mutex);
 
        if (device_may_wakeup(&client->dev)) {
-               if (!input->users) {
+               if (!input_device_enabled(input)) {
                        ret = pixcir_stop(ts);
                        if (ret) {
                                dev_err(dev, "Failed to stop\n");
                                goto unlock;
                        }
                }
-       } else if (input->users) {
+       } else if (input_device_enabled(input)) {
                ret = pixcir_start(ts);
        }