On 25/05/2020 11.58, Dinghao Liu wrote:

When clk_set_parent() returns an error code, a pairing runtime PM usage counter increment is needed to keep the counter balanced.

Signed-off-by: Dinghao Liu dinghao.liu@zju.edu.cn

Changelog:

v2: - Fix this in a cleaner way.

Thanks for the update, Acked-by: Peter Ujfalusi peter.ujfalusi@ti.com

---

sound/soc/ti/omap-mcbsp.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/sound/soc/ti/omap-mcbsp.c b/sound/soc/ti/omap-mcbsp.c index 3d41ca2238d4..d7406cc3c2a5 100644 --- a/sound/soc/ti/omap-mcbsp.c +++ b/sound/soc/ti/omap-mcbsp.c @@ -77,18 +77,15 @@ static int omap2_mcbsp_set_clks_src(struct omap_mcbsp *mcbsp, u8 fck_src_id) pm_runtime_put_sync(mcbsp->dev);

r = clk_set_parent(mcbsp->fclk, fck_src);

• if (r) {

• if (r) dev_err(mcbsp->dev, "CLKS: could not clk_set_parent() to %s\n", src);

• clk_put(fck_src);
  

• return r;
  

• }

  pm_runtime_get_sync(mcbsp->dev);

  clk_put(fck_src);

• return 0;

• return r;

}

static irqreturn_t omap_mcbsp_irq_handler(int irq, void *data)

- Péter

Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki