| commit | 84bbc4aa2de97143db0f6ef0c3fa0bd84f73b207 | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@linaro.org> | Mon Jun 17 17:20:33 2013 +0100 |
| committer | Mark Brown <broonie@linaro.org> | Mon Jun 17 17:20:33 2013 +0100 |
| tree | 4b9756a68d246c59713b8c0946ad7f86e3f12787 | |
| parent | 5464389755b78e235c999c2dcf58718d23326d46 [diff] | |
| parent | 48dcf1d82fd8158ac8a9b843abb4965c69a19781 [diff] |
Merge remote-tracking branch 'asoc/topic/x86' into asoc-next
diff --git a/sound/soc/mid-x86/mfld_machine.c b/sound/soc/mid-x86/mfld_machine.c index 4139116..78d5825 100644 --- a/sound/soc/mid-x86/mfld_machine.c +++ b/sound/soc/mid-x86/mfld_machine.c
@@ -425,7 +425,6 @@ 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; }