* [PATCH v2 1/1] ov7251: Fix multiple problems in s_stream callback
@ 2022-05-18 15:54 Sakari Ailus
2022-06-02 11:33 ` Andy Shevchenko
0 siblings, 1 reply; 2+ messages in thread
From: Sakari Ailus @ 2022-05-18 15:54 UTC (permalink / raw)
To: linux-media
Cc: yong.zhi, sakari.ailus, bingbu.cao, tian.shu.qiu,
andriy.shevchenko, hverkuil-cisco, Daniel Scally
The s_stream callback had several issues:
- If pm_runtime_get_sync() fails, the usage_count is not put.
- The sensor wasn't suspended if s_stream(subdev, 1) failed.
Fix this.
Fixes: ("media: i2c: Add pm_runtime support to ov7251")
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
drivers/media/i2c/ov7251.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/media/i2c/ov7251.c b/drivers/media/i2c/ov7251.c
index 0e7be15bc20a7..603a4c7049e69 100644
--- a/drivers/media/i2c/ov7251.c
+++ b/drivers/media/i2c/ov7251.c
@@ -1340,7 +1340,7 @@ static int ov7251_s_stream(struct v4l2_subdev *subdev, int enable)
if (enable) {
ret = pm_runtime_get_sync(ov7251->dev);
if (ret < 0)
- goto unlock_out;
+ goto err_power_down;
ret = ov7251_pll_configure(ov7251);
if (ret) {
@@ -1372,12 +1372,11 @@ static int ov7251_s_stream(struct v4l2_subdev *subdev, int enable)
pm_runtime_put(ov7251->dev);
}
-unlock_out:
mutex_unlock(&ov7251->lock);
return ret;
err_power_down:
- pm_runtime_put_noidle(ov7251->dev);
+ pm_runtime_put(ov7251->dev);
mutex_unlock(&ov7251->lock);
return ret;
}
--
2.30.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2 1/1] ov7251: Fix multiple problems in s_stream callback
2022-05-18 15:54 [PATCH v2 1/1] ov7251: Fix multiple problems in s_stream callback Sakari Ailus
@ 2022-06-02 11:33 ` Andy Shevchenko
0 siblings, 0 replies; 2+ messages in thread
From: Andy Shevchenko @ 2022-06-02 11:33 UTC (permalink / raw)
To: Sakari Ailus
Cc: linux-media, yong.zhi, bingbu.cao, tian.shu.qiu, hverkuil-cisco,
Daniel Scally
On Wed, May 18, 2022 at 06:54:08PM +0300, Sakari Ailus wrote:
> The s_stream callback had several issues:
>
> - If pm_runtime_get_sync() fails, the usage_count is not put.
>
> - The sensor wasn't suspended if s_stream(subdev, 1) failed.
>
> Fix this.
Perhaps late, but nevertheless
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> Fixes: ("media: i2c: Add pm_runtime support to ov7251")
> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> ---
> drivers/media/i2c/ov7251.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/media/i2c/ov7251.c b/drivers/media/i2c/ov7251.c
> index 0e7be15bc20a7..603a4c7049e69 100644
> --- a/drivers/media/i2c/ov7251.c
> +++ b/drivers/media/i2c/ov7251.c
> @@ -1340,7 +1340,7 @@ static int ov7251_s_stream(struct v4l2_subdev *subdev, int enable)
> if (enable) {
> ret = pm_runtime_get_sync(ov7251->dev);
> if (ret < 0)
> - goto unlock_out;
> + goto err_power_down;
>
> ret = ov7251_pll_configure(ov7251);
> if (ret) {
> @@ -1372,12 +1372,11 @@ static int ov7251_s_stream(struct v4l2_subdev *subdev, int enable)
> pm_runtime_put(ov7251->dev);
> }
>
> -unlock_out:
> mutex_unlock(&ov7251->lock);
> return ret;
>
> err_power_down:
> - pm_runtime_put_noidle(ov7251->dev);
> + pm_runtime_put(ov7251->dev);
> mutex_unlock(&ov7251->lock);
> return ret;
> }
> --
> 2.30.2
>
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-06-02 11:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-18 15:54 [PATCH v2 1/1] ov7251: Fix multiple problems in s_stream callback Sakari Ailus
2022-06-02 11:33 ` Andy Shevchenko
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.