media: smiapp: Fix error handling at NVM reading

If NVM reading failed, the device was left powered on. Fix that.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/drivers/media/i2c/smiapp/smiapp-core.c b/drivers/media/i2c/smiapp/smiapp-core.c
index 8fa0290ad15c1570e70eb50f83a7ee272d85d7b1..13f7a6315f39c54f884eab16e1bce69a7795080d 100644 (file)
--- a/drivers/media/i2c/smiapp/smiapp-core.c
+++ b/drivers/media/i2c/smiapp/smiapp-core.c
@@ -2326,11 +2326,12 @@ smiapp_sysfs_nvm_read(struct device *dev, struct device_attribute *attr,
                if (rval < 0) {
                        if (rval != -EBUSY && rval != -EAGAIN)
                                pm_runtime_set_active(&client->dev);
-                       pm_runtime_put(&client->dev);
+                       pm_runtime_put_noidle(&client->dev);
                        return -ENODEV;
                }
 
                if (smiapp_read_nvm(sensor, sensor->nvm)) {
+                       pm_runtime_put(&client->dev);
                        dev_err(&client->dev, "nvm read failed\n");
                        return -ENODEV;
                }