Commit a5b1d541 authored by Sakari Ailus's avatar Sakari Ailus Committed by Mauro Carvalho Chehab

media: smiapp: Fix error handling at NVM reading

If NVM reading failed, the device was left powered on. Fix that.
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 837c07eb
...@@ -2326,11 +2326,12 @@ smiapp_sysfs_nvm_read(struct device *dev, struct device_attribute *attr, ...@@ -2326,11 +2326,12 @@ smiapp_sysfs_nvm_read(struct device *dev, struct device_attribute *attr,
if (rval < 0) { if (rval < 0) {
if (rval != -EBUSY && rval != -EAGAIN) if (rval != -EBUSY && rval != -EAGAIN)
pm_runtime_set_active(&client->dev); pm_runtime_set_active(&client->dev);
pm_runtime_put(&client->dev); pm_runtime_put_noidle(&client->dev);
return -ENODEV; return -ENODEV;
} }
if (smiapp_read_nvm(sensor, sensor->nvm)) { if (smiapp_read_nvm(sensor, sensor->nvm)) {
pm_runtime_put(&client->dev);
dev_err(&client->dev, "nvm read failed\n"); dev_err(&client->dev, "nvm read failed\n");
return -ENODEV; return -ENODEV;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment