diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-11 10:17:15 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-11 10:17:15 (GMT) |
| commit | c34c0d7684b8b79666da6b1bc37fc330cd0dd216 (patch) | |
| tree | c2bc72d67862df770af45a88814759baa0744d2c /sound/soc/dwc/designware_i2s.c | |
| parent | 29dc5dd229dc3130b51df0932e59946fc09d3bd4 (diff) | |
| parent | 4345adf92db760ca1a54061ce284aaa2e7d0791e (diff) | |
| download | linux-fsl-qoriq-c34c0d7684b8b79666da6b1bc37fc330cd0dd216.tar.xz | |
Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus
Diffstat (limited to 'sound/soc/dwc/designware_i2s.c')
| -rw-r--r-- | sound/soc/dwc/designware_i2s.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/soc/dwc/designware_i2s.c b/sound/soc/dwc/designware_i2s.c index 70eb37a..25c31f1 100644 --- a/sound/soc/dwc/designware_i2s.c +++ b/sound/soc/dwc/designware_i2s.c @@ -421,13 +421,11 @@ static int dw_i2s_probe(struct platform_device *pdev) dw_i2s_dai, 1); if (ret != 0) { dev_err(&pdev->dev, "not able to register dai\n"); - goto err_set_drvdata; + goto err_clk_disable; } return 0; -err_set_drvdata: - dev_set_drvdata(&pdev->dev, NULL); err_clk_disable: clk_disable(dev->clk); err_clk_put: @@ -440,7 +438,6 @@ static int dw_i2s_remove(struct platform_device *pdev) struct dw_i2s_dev *dev = dev_get_drvdata(&pdev->dev); snd_soc_unregister_component(&pdev->dev); - dev_set_drvdata(&pdev->dev, NULL); clk_put(dev->clk); |