lkml.org 
[lkml]   [2020]   [Sep]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 011/206] media: smiapp: Fix error handling at NVM reading
    Date
    From: Sakari Ailus <sakari.ailus@linux.intel.com>

    [ Upstream commit a5b1d5413534607b05fb34470ff62bf395f5c8d0 ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/media/i2c/smiapp/smiapp-core.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/media/i2c/smiapp/smiapp-core.c b/drivers/media/i2c/smiapp/smiapp-core.c
    index 4731e1c72f960..0a434bdce3b3b 100644
    --- a/drivers/media/i2c/smiapp/smiapp-core.c
    +++ b/drivers/media/i2c/smiapp/smiapp-core.c
    @@ -2337,11 +2337,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;
    }
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-09-18 04:08    [W:4.091 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site