| Message ID | 20200613223008.11720-1-wu000273@umn.edu (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: rcar-vin: Fix a reference count leak. | expand |
Hi Qiushi, Thank you for the patch. On Sat, Jun 13, 2020 at 05:30:08PM -0500, 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: 90dedce9bc54 ("media: rcar-vin: add function to manipulate Gen3 chsel value") > Signed-off-by: Qiushi Wu <wu000273@umn.edu> This should be squashed with the other patch that you have sent for the driver, with the exact same subject line. This being said, as commented on your similar patch for the vsp1 driver, I'd rather see the problem being fixed inside pm_runtime_get_sync(). > --- > drivers/media/platform/rcar-vin/rcar-dma.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/media/platform/rcar-vin/rcar-dma.c b/drivers/media/platform/rcar-vin/rcar-dma.c > index 1a30cd036371..95bc9e0e8792 100644 > --- a/drivers/media/platform/rcar-vin/rcar-dma.c > +++ b/drivers/media/platform/rcar-vin/rcar-dma.c > @@ -1392,8 +1392,10 @@ int rvin_set_channel_routing(struct rvin_dev *vin, u8 chsel) > int ret; > > ret = pm_runtime_get_sync(vin->dev); > - if (ret < 0) > + if (ret < 0) { > + pm_runtime_put_noidle(vin->dev); > return ret; > + } > > /* Make register writes take effect immediately. */ > vnmc = rvin_read(vin, VNMC_REG);
diff --git a/drivers/media/platform/rcar-vin/rcar-dma.c b/drivers/media/platform/rcar-vin/rcar-dma.c index 1a30cd036371..95bc9e0e8792 100644 --- a/drivers/media/platform/rcar-vin/rcar-dma.c +++ b/drivers/media/platform/rcar-vin/rcar-dma.c @@ -1392,8 +1392,10 @@ int rvin_set_channel_routing(struct rvin_dev *vin, u8 chsel) int ret; ret = pm_runtime_get_sync(vin->dev); - if (ret < 0) + if (ret < 0) { + pm_runtime_put_noidle(vin->dev); return ret; + } /* Make register writes take effect immediately. */ vnmc = rvin_read(vin, VNMC_REG);