| Message ID | 20200613230843.14109-1-wu000273@umn.edu (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: mtk-jpeg: Fix a reference count leak. | expand |
On 14/06/2020 01:08, wu000273@umn.edu wrote: > From: Qiushi Wu <wu000273@umn.edu> > > pm_runtime_get_sync() increments the runtime PM usage counter even > when it returns an error code. Thus call pm_runtime_put_noidle() > if pm_runtime_get_sync() fails. > > Fixes: b2f0d2724ba4 ("[media] vcodec: mediatek: Add Mediatek JPEG Decoder Driver") > Signed-off-by: Qiushi Wu <wu000273@umn.edu> > --- > drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c > index f82a81a3bdee..097f0b050f67 100644 > --- a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c > +++ b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c > @@ -710,8 +710,10 @@ static int mtk_jpeg_start_streaming(struct vb2_queue *q, unsigned int count) > int ret = 0; > > ret = pm_runtime_get_sync(ctx->jpeg->dev); > - if (ret < 0) > + if (ret < 0) { > + pm_runtime_put_noidle(ctx->jpeg->dev); > goto err; > + } > > return 0; > err: > This patch no longer applies, can you rebase this? Regards, Hans
On Thu, 17 Sept 2020 at 13:48, Hans Verkuil <hverkuil@xs4all.nl> wrote: > > On 14/06/2020 01:08, wu000273@umn.edu wrote: > > From: Qiushi Wu <wu000273@umn.edu> > > > > pm_runtime_get_sync() increments the runtime PM usage counter even > > when it returns an error code. Thus call pm_runtime_put_noidle() > > if pm_runtime_get_sync() fails. > > > > Fixes: b2f0d2724ba4 ("[media] vcodec: mediatek: Add Mediatek JPEG Decoder Driver") > > Signed-off-by: Qiushi Wu <wu000273@umn.edu> > > --- > > drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 4 +++- > > 1 file changed, 3 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c > > index f82a81a3bdee..097f0b050f67 100644 > > --- a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c > > +++ b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c > > @@ -710,8 +710,10 @@ static int mtk_jpeg_start_streaming(struct vb2_queue *q, unsigned int count) > > int ret = 0; > > > > ret = pm_runtime_get_sync(ctx->jpeg->dev); > > - if (ret < 0) > > + if (ret < 0) { > > + pm_runtime_put_noidle(ctx->jpeg->dev); > > goto err; > > + } > > > > return 0; > > err: > > > > This patch no longer applies, can you rebase this? This patch might be harmful, might be not. Probably should be skipped due to uncertain intentions: https://lore.kernel.org/linux-nfs/YH+7ZydHv4+Y1hlx@kroah.com/ Best regards, Krzysztof
diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c index f82a81a3bdee..097f0b050f67 100644 --- a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c +++ b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c @@ -710,8 +710,10 @@ static int mtk_jpeg_start_streaming(struct vb2_queue *q, unsigned int count) int ret = 0; ret = pm_runtime_get_sync(ctx->jpeg->dev); - if (ret < 0) + if (ret < 0) { + pm_runtime_put_noidle(ctx->jpeg->dev); goto err; + } return 0; err: