| Message ID | 9af8128918e2da97801f1122ae06336b1bd1012f.1419342218.git.Andrew.Jackson@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 12/23/14 13:56, Andrew Jackson wrote: > From: Andrew Jackson <Andrew.Jackson@arm.com> > > Simplify error handling during probe by using managed clock > resources. In my haste to get to the Christmas turkey I missed a clk_put elsewhere. Will fix and resubmit. Andrew > Signed-off-by: Andrew Jackson <Andrew.Jackson@arm.com> > --- > sound/soc/dwc/designware_i2s.c | 6 ++---- > 1 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/sound/soc/dwc/designware_i2s.c b/sound/soc/dwc/designware_i2s.c > index 9573ec7..b3dc535 100644 > --- a/sound/soc/dwc/designware_i2s.c > +++ b/sound/soc/dwc/designware_i2s.c > @@ -407,13 +407,13 @@ static int dw_i2s_probe(struct platform_device *pdev) > > dev->capability = pdata->cap; > dev->i2s_clk_cfg = pdata->i2s_clk_cfg; > - dev->clk = clk_get(&pdev->dev, NULL); > + dev->clk = devm_clk_get(&pdev->dev, NULL); > if (IS_ERR(dev->clk)) > return PTR_ERR(dev->clk); > > ret = clk_prepare_enable(dev->clk); > if (ret < 0) > - goto err_clk_put; > + return ret; > > dev_set_drvdata(&pdev->dev, dev); > ret = snd_soc_register_component(&pdev->dev, &dw_i2s_component, > @@ -427,8 +427,6 @@ static int dw_i2s_probe(struct platform_device *pdev) > > err_clk_disable: > clk_disable(dev->clk); > -err_clk_put: > - clk_put(dev->clk); > return ret; > } > >
diff --git a/sound/soc/dwc/designware_i2s.c b/sound/soc/dwc/designware_i2s.c index 9573ec7..b3dc535 100644 --- a/sound/soc/dwc/designware_i2s.c +++ b/sound/soc/dwc/designware_i2s.c @@ -407,13 +407,13 @@ static int dw_i2s_probe(struct platform_device *pdev) dev->capability = pdata->cap; dev->i2s_clk_cfg = pdata->i2s_clk_cfg; - dev->clk = clk_get(&pdev->dev, NULL); + dev->clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(dev->clk)) return PTR_ERR(dev->clk); ret = clk_prepare_enable(dev->clk); if (ret < 0) - goto err_clk_put; + return ret; dev_set_drvdata(&pdev->dev, dev); ret = snd_soc_register_component(&pdev->dev, &dw_i2s_component, @@ -427,8 +427,6 @@ static int dw_i2s_probe(struct platform_device *pdev) err_clk_disable: clk_disable(dev->clk); -err_clk_put: - clk_put(dev->clk); return ret; }