diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-25 11:17:24 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-25 11:17:24 +0000 |
| commit | 2c54c1586c78775cfdfb071e68b27e14b668921f (patch) | |
| tree | cf57390a0b82d2bd1ade5e5356434c66c39af38a /sound/soc/davinci | |
| parent | b26bb71f610f9b346203bff407e4278d98f9fe80 (diff) | |
| parent | 8b6b30ab665d3bbb23180c39f6215e6f64516ed0 (diff) | |
Merge branch 'for-2.6.37' into for-2.6.38
Diffstat (limited to 'sound/soc/davinci')
| -rw-r--r-- | sound/soc/davinci/davinci-vcif.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/soc/davinci/davinci-vcif.c b/sound/soc/davinci/davinci-vcif.c index fb4cc1edf33..9d2afccc3a2 100644 --- a/sound/soc/davinci/davinci-vcif.c +++ b/sound/soc/davinci/davinci-vcif.c @@ -247,7 +247,10 @@ fail: static int davinci_vcif_remove(struct platform_device *pdev) { + struct davinci_vcif_dev *davinci_vcif_dev = dev_get_drvdata(&pdev->dev); + snd_soc_unregister_dai(&pdev->dev); + kfree(davinci_vcif_dev); return 0; } |