summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-06-17 20:20:33 +0400
committerMark Brown <broonie@linaro.org>2013-06-17 20:20:33 +0400
commit84bbc4aa2de97143db0f6ef0c3fa0bd84f73b207 (patch)
tree4b9756a68d246c59713b8c0946ad7f86e3f12787
parent5464389755b78e235c999c2dcf58718d23326d46 (diff)
parent48dcf1d82fd8158ac8a9b843abb4965c69a19781 (diff)
downloadlinux-84bbc4aa2de97143db0f6ef0c3fa0bd84f73b207.tar.xz
Merge remote-tracking branch 'asoc/topic/x86' into asoc-next
-rw-r--r--sound/soc/mid-x86/mfld_machine.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/mid-x86/mfld_machine.c b/sound/soc/mid-x86/mfld_machine.c
index 4139116c33b5..78d582519891 100644
--- a/sound/soc/mid-x86/mfld_machine.c
+++ b/sound/soc/mid-x86/mfld_machine.c
@@ -425,7 +425,6 @@ static int snd_mfld_mc_remove(struct platform_device *pdev)
free_irq(platform_get_irq(pdev, 0), mc_drv_ctx);
snd_soc_unregister_card(&snd_soc_card_mfld);
kfree(mc_drv_ctx);
- platform_set_drvdata(pdev, NULL);
return 0;
}