diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-24 11:24:06 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-24 11:24:06 +0100 |
| commit | 8ff9f38bda4d7a49eb7afd203cddcb5d79236061 (patch) | |
| tree | 0ff47ac63fd69d6ee8370148d35f8ab0d834e87c /sound/soc/fsl/imx-ssi.c | |
| parent | 54128df2ba578b091c563d8e698f4944020fb8d9 (diff) | |
| parent | 1abe729f783fece81d93e9a0253fd8079f19d7f6 (diff) | |
| download | op-kernel-dev-8ff9f38bda4d7a49eb7afd203cddcb5d79236061.zip op-kernel-dev-8ff9f38bda4d7a49eb7afd203cddcb5d79236061.tar.gz | |
Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next
Diffstat (limited to 'sound/soc/fsl/imx-ssi.c')
| -rw-r--r-- | sound/soc/fsl/imx-ssi.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c index 57d6941..f5f248c 100644 --- a/sound/soc/fsl/imx-ssi.c +++ b/sound/soc/fsl/imx-ssi.c @@ -613,7 +613,6 @@ static int imx_ssi_probe(struct platform_device *pdev) failed_pcm: snd_soc_unregister_component(&pdev->dev); failed_register: - release_mem_region(res->start, resource_size(res)); clk_disable_unprepare(ssi->clk); failed_clk: snd_soc_set_ac97_ops(NULL); @@ -623,7 +622,6 @@ failed_clk: static int imx_ssi_remove(struct platform_device *pdev) { - struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0); struct imx_ssi *ssi = platform_get_drvdata(pdev); if (!ssi->dma_init) @@ -637,7 +635,6 @@ static int imx_ssi_remove(struct platform_device *pdev) if (ssi->flags & IMX_SSI_USE_AC97) ac97_ssi = NULL; - release_mem_region(res->start, resource_size(res)); clk_disable_unprepare(ssi->clk); snd_soc_set_ac97_ops(NULL); |
