summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-05-28 15:58:14 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-05-28 15:58:14 +0100
commit43224c604fb9fc5b35f791a6d12873c00d969303 (patch)
tree66f0773f80154e816e6270e8e34061cbebb922ac /sound
parent7ca067454abbeb17dd164e4e5cdac7c698ece374 (diff)
parent3d77876b8fd43ba845f3503369590a9bcc1f1e0c (diff)
Merge remote-tracking branch 'asoc/topic/omap' into asoc-next
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/omap/omap-mcbsp.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index eadbfb6b5000..7483efb6dc67 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -814,8 +814,6 @@ static int asoc_mcbsp_remove(struct platform_device *pdev)
clk_put(mcbsp->fclk);
- platform_set_drvdata(pdev, NULL);
-
return 0;
}