summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-08-30 11:04:20 +0100
committerMark Brown <broonie@linaro.org>2013-08-30 11:04:20 +0100
commitc5b47442e515750be42ae46d49e5e903dd9bb4c2 (patch)
tree76aea126e3f0dfe72476fcd68423778a9c2d4236 /sound
parentc79c33af8f867e57ad4b84102db7901aee67485a (diff)
parente925a6b1b6e7ddb43a71b31c0afa12ca9a6ec118 (diff)
downloadlinux-c5b47442e515750be42ae46d49e5e903dd9bb4c2.tar.bz2
Merge remote-tracking branch 'asoc/topic/designware' into tmp
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/dwc/designware_i2s.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/soc/dwc/designware_i2s.c b/sound/soc/dwc/designware_i2s.c
index 70eb37a5dd16..25c31f1655f6 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);