Hi Mauro, On Sat, Apr 24, 2021 at 08:44:48AM +0200, Mauro Carvalho Chehab wrote: > Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal with usage counter") > added pm_runtime_resume_and_get() in order to automatically handle > dev->power.usage_count decrement on errors. > > Use the new API, in order to cleanup the error check logic. > > Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@xxxxxxxxxx> Thanks Acked-by: Jacopo Mondi <jacopo@xxxxxxxxxx> I should re-work the error handling sequence there on top of this patch as right now it's not the best, that 'done' label bothers me... anyway, for later. > --- > drivers/media/i2c/mt9m001.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/drivers/media/i2c/mt9m001.c b/drivers/media/i2c/mt9m001.c > index 3b0ba8ed5233..57e15a291ebd 100644 > --- a/drivers/media/i2c/mt9m001.c > +++ b/drivers/media/i2c/mt9m001.c > @@ -217,9 +217,9 @@ static int mt9m001_s_stream(struct v4l2_subdev *sd, int enable) > goto done; > > if (enable) { > - ret = pm_runtime_get_sync(&client->dev); > + ret = pm_runtime_resume_and_get(&client->dev); > if (ret < 0) > - goto put_unlock; > + goto unlock; > > ret = mt9m001_apply_selection(sd); > if (ret) > @@ -247,6 +247,7 @@ static int mt9m001_s_stream(struct v4l2_subdev *sd, int enable) > > put_unlock: > pm_runtime_put(&client->dev); > +unlock: > mutex_unlock(&mt9m001->mutex); > > return ret; > @@ -834,7 +835,7 @@ static int mt9m001_remove(struct i2c_client *client) > { > struct mt9m001 *mt9m001 = to_mt9m001(client); > > - pm_runtime_get_sync(&client->dev); > + pm_runtime_resume_and_get(&client->dev); > > v4l2_async_unregister_subdev(&mt9m001->subdev); > media_entity_cleanup(&mt9m001->subdev.entity); > -- > 2.30.2 >