diff options
| author |   Sakari Ailus <sakari.ailus@linux.intel.com> | 2019-09-23 11:25:42 -0300 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2019-10-24 18:51:11 -0300 |
| commit | a5b1d5413534607b05fb34470ff62bf395f5c8d0 (patch) | |
| tree | f4d15d63b177a94983d27abb96317642554ed34a /drivers/media | |
| parent | media: smiapp: Use the BIT macro where appropriate, remove useless definition (diff) | |
| download | linux-dev-a5b1d5413534607b05fb34470ff62bf395f5c8d0.tar.xz linux-dev-a5b1d5413534607b05fb34470ff62bf395f5c8d0.zip | |
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>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/i2c/smiapp/smiapp-core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/i2c/smiapp/smiapp-core.c b/drivers/media/i2c/smiapp/smiapp-core.c index 8fa0290ad15c..13f7a6315f39 100644 --- 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; } |