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

Commit 8d99bcba authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "input: atmel_mxt_ts: Synchronous PM request starting Secure Touch"

parents e949e8f9 7c836ef5

drivers/input/touchscreen/atmel_mxt_ts.c

+3 −2
Original line number Diff line number Diff line
@@ -2055,6 +2055,7 @@ static ssize_t mxt_secure_touch_enable_store(struct device *dev, 
				    const char *buf, size_t count)

{

	struct mxt_data *data = dev_get_drvdata(dev);

	struct device *adapter = data->client->adapter->dev.parent;

	unsigned long value;

	int err = 0;
@@ -2072,7 +2073,7 @@ static ssize_t mxt_secure_touch_enable_store(struct device *dev, 
		if (atomic_read(&data->st_enabled) == 0)

			break;



		pm_runtime_put(data->client->adapter->dev.parent);

		pm_runtime_put(adapter);

		atomic_set(&data->st_enabled, 0);

		mxt_secure_touch_notify(data);

		mxt_interrupt(data->client->irq, data);
@@ -2084,7 +2085,7 @@ static ssize_t mxt_secure_touch_enable_store(struct device *dev, 
			break;

		}



		if (pm_runtime_get(data->client->adapter->dev.parent) < 0) {

		if (pm_runtime_get_sync(adapter) < 0) {

			dev_err(&data->client->dev, "pm_runtime_get failed\n");

			err = -EIO;

			break;