aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-08-30 06:04:21 -0400
committerMark Brown <broonie@linaro.org>2013-08-30 06:04:21 -0400
commit429aff708200fdf971c51c4b37cfd9fbc8e49991 (patch)
treec0b62a9029788b18d4ab552b93749b761f343b63 /sound
parentc5b47442e515750be42ae46d49e5e903dd9bb4c2 (diff)
parentba1fb69508615011eba225de1ed2615fa205be9a (diff)
Merge remote-tracking branch 'asoc/topic/ep93xx' into tmp
Diffstat (limited to 'sound')
-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)
408 return 0; 408 return 0;
409 409
410fail_put_lrclk: 410fail_put_lrclk:
411 dev_set_drvdata(&pdev->dev, NULL);
412 clk_put(info->lrclk); 411 clk_put(info->lrclk);
413fail_put_sclk: 412fail_put_sclk:
414 clk_put(info->sclk); 413 clk_put(info->sclk);
@@ -423,7 +422,6 @@ static int ep93xx_i2s_remove(struct platform_device *pdev)
423 struct ep93xx_i2s_info *info = dev_get_drvdata(&pdev->dev); 422 struct ep93xx_i2s_info *info = dev_get_drvdata(&pdev->dev);
424 423
425 snd_soc_unregister_component(&pdev->dev); 424 snd_soc_unregister_component(&pdev->dev);
426 dev_set_drvdata(&pdev->dev, NULL);
427 clk_put(info->lrclk); 425 clk_put(info->lrclk);
428 clk_put(info->sclk); 426 clk_put(info->sclk);
429 clk_put(info->mclk); 427 clk_put(info->mclk);