commit 393ffddae8176428814767ac42279db1f224d41b
author Linux Build Service Account <lnxbuild@localhost> Mon Mar 24 11:51:52 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Mar 24 11:51:52 2014 -0700
tree 980aad46ab2f14d0f4a4b8a99f7966d2e32c1294
parent ae0f7ca6845f65be65a6e5c3cc95ca07a2652562
parent f0655aa6ee2ec385192bb219c4e42ed3a35d7b67

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

drivers/input/touchscreen/atmel_mxt_ts.c

diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index cd6989c..be7c3c6 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -1983,6 +1983,7 @@
 				    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;
 
@@ -2000,7 +2001,7 @@
 		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);
@@ -2012,7 +2013,7 @@
 			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;