Input: stmfts - do not leave device disabled in stmfts_input_open

The commit 26623eea0da3 attempted to deal with potential leak of runtime
PM counter when opening the touchscreen device, however it ended up
erroneously dropping the counter in the case of successfully enabling the
device.

Let's address this by using pm_runtime_resume_and_get() and then executing
pm_runtime_put_sync() only when we fail to send "sense on" command to the
device.

Fixes: 26623eea0da3 ("Input: stmfts - fix reference leak in stmfts_input_open")
Reported-by: Pavel Machek <pavel@denx.de>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/touchscreen/stmfts.c b/drivers/input/touchscreen/stmfts.c
index 72e0b767e1ba4c87c31b5346c45746f82ff9773b..c175d44c52f37011d8d29d7a664240733e129302 100644 (file)
--- a/drivers/input/touchscreen/stmfts.c
+++ b/drivers/input/touchscreen/stmfts.c
@@ -337,13 +337,15 @@ static int stmfts_input_open(struct input_dev *dev)
        struct stmfts_data *sdata = input_get_drvdata(dev);
        int err;
 
-       err = pm_runtime_get_sync(&sdata->client->dev);
-       if (err < 0)
-               goto out;
+       err = pm_runtime_resume_and_get(&sdata->client->dev);
+       if (err)
+               return err;
 
        err = i2c_smbus_write_byte(sdata->client, STMFTS_MS_MT_SENSE_ON);
-       if (err)
-               goto out;
+       if (err) {
+               pm_runtime_put_sync(&sdata->client->dev);
+               return err;
+       }
 
        mutex_lock(&sdata->mutex);
        sdata->running = true;
@@ -366,9 +368,7 @@ static int stmfts_input_open(struct input_dev *dev)
                                 "failed to enable touchkey\n");
        }
 
-out:
-       pm_runtime_put_noidle(&sdata->client->dev);
-       return err;
+       return 0;
 }
 
 static void stmfts_input_close(struct input_dev *dev)