diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-04 17:30:01 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-04 17:30:01 (GMT) |
| commit | 986a622df307644af14618bee54c901aa74816da (patch) | |
| tree | 6da87812b9120634381e3e3987e115f90bd562e0 /sound/soc/mid-x86 | |
| parent | 8bb495e3f02401ee6f76d1b1d77f3ac9f079e376 (diff) | |
| parent | 28e5ca73ef9072ed58dbb81cfff6f908be8e3cd4 (diff) | |
| download | linux-fsl-qoriq-986a622df307644af14618bee54c901aa74816da.tar.xz | |
Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus
Diffstat (limited to 'sound/soc/mid-x86')
| -rw-r--r-- | sound/soc/mid-x86/mfld_machine.c | 1 |
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 4139116..78d5825 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; } |