Merge remote-tracking branch 'asoc/topic/ep93xx' into tmp
This commit is contained in:
@ -408,7 +408,6 @@ static int ep93xx_i2s_probe(struct platform_device *pdev)
|
|||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
fail_put_lrclk:
|
fail_put_lrclk:
|
||||||
dev_set_drvdata(&pdev->dev, NULL);
|
|
||||||
clk_put(info->lrclk);
|
clk_put(info->lrclk);
|
||||||
fail_put_sclk:
|
fail_put_sclk:
|
||||||
clk_put(info->sclk);
|
clk_put(info->sclk);
|
||||||
@ -423,7 +422,6 @@ static int ep93xx_i2s_remove(struct platform_device *pdev)
|
|||||||
struct ep93xx_i2s_info *info = dev_get_drvdata(&pdev->dev);
|
struct ep93xx_i2s_info *info = dev_get_drvdata(&pdev->dev);
|
||||||
|
|
||||||
snd_soc_unregister_component(&pdev->dev);
|
snd_soc_unregister_component(&pdev->dev);
|
||||||
dev_set_drvdata(&pdev->dev, NULL);
|
|
||||||
clk_put(info->lrclk);
|
clk_put(info->lrclk);
|
||||||
clk_put(info->sclk);
|
clk_put(info->sclk);
|
||||||
clk_put(info->mclk);
|
clk_put(info->mclk);
|
||||||
|
Reference in New Issue
Block a user