diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-25 12:17:24 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-25 12:17:24 +0100 |
| commit | 2c54c1586c78775cfdfb071e68b27e14b668921f (patch) | |
| tree | cf57390a0b82d2bd1ade5e5356434c66c39af38a /sound/soc/sh | |
| parent | ASoC: smdk_wm9713: fix resource leak in smdk_init error path (diff) | |
| parent | ASoC: davinci-vcif - fix a memory leak (diff) | |
| download | linux-2c54c1586c78775cfdfb071e68b27e14b668921f.tar.xz linux-2c54c1586c78775cfdfb071e68b27e14b668921f.zip | |
Merge branch 'for-2.6.37' into for-2.6.38
Diffstat (limited to 'sound/soc/sh')
| -rw-r--r-- | sound/soc/sh/ssi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/sh/ssi.c b/sound/soc/sh/ssi.c index 40bbdf1591dc..05192d97b377 100644 --- a/sound/soc/sh/ssi.c +++ b/sound/soc/sh/ssi.c @@ -387,7 +387,7 @@ static int __devinit sh4_soc_dai_probe(struct platform_device *pdev) static int __devexit sh4_soc_dai_remove(struct platform_device *pdev) { - snd_soc_unregister_dai(&pdev->dev, ARRAY_SIZE(sh4_ssi_dai)); + snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(sh4_ssi_dai)); return 0; } |