summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-08-30 11:04:21 +0100
committerMark Brown <broonie@linaro.org>2013-08-30 11:04:21 +0100
commit429aff708200fdf971c51c4b37cfd9fbc8e49991 (patch)
treec0b62a9029788b18d4ab552b93749b761f343b63 /sound/soc
parentc5b47442e515750be42ae46d49e5e903dd9bb4c2 (diff)
parentba1fb69508615011eba225de1ed2615fa205be9a (diff)
downloadtalos-op-linux-429aff708200fdf971c51c4b37cfd9fbc8e49991.tar.gz
talos-op-linux-429aff708200fdf971c51c4b37cfd9fbc8e49991.zip
Merge remote-tracking branch 'asoc/topic/ep93xx' into tmp
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/cirrus/ep93xx-i2s.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/cirrus/ep93xx-i2s.c b/sound/soc/cirrus/ep93xx-i2s.c
index f23f331e9a97..a57643d6402f 100644
--- a/sound/soc/cirrus/ep93xx-i2s.c
+++ b/sound/soc/cirrus/ep93xx-i2s.c
@@ -408,7 +408,6 @@ static int ep93xx_i2s_probe(struct platform_device *pdev)
return 0;
fail_put_lrclk:
- dev_set_drvdata(&pdev->dev, NULL);
clk_put(info->lrclk);
fail_put_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);
snd_soc_unregister_component(&pdev->dev);
- dev_set_drvdata(&pdev->dev, NULL);
clk_put(info->lrclk);
clk_put(info->sclk);
clk_put(info->mclk);
OpenPOWER on IntegriCloud