]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ASoC: ti: Fix runtime PM imbalance in omap2_mcbsp_set_clks_src
authorDinghao Liu <dinghao.liu@zju.edu.cn>
Mon, 25 May 2020 08:58:48 +0000 (16:58 +0800)
committerMark Brown <broonie@kernel.org>
Tue, 26 May 2020 16:20:22 +0000 (17:20 +0100)
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>
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Link: https://lore.kernel.org/r/20200525085848.4227-1-dinghao.liu@zju.edu.cn
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/ti/omap-mcbsp.c

index 4e67769b795aa4acf3636885384e4e8ca7858803..32e3ccdbb7a27908039ae45eb12e9ec023aad8e5 100644 (file)
@@ -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)