diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-15 10:20:00 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-15 10:20:00 +0000 |
| commit | 092d40505202ebc9fdfa5582f469458c7dd62257 (patch) | |
| tree | c5eef31c3f9dbbf5a127a81e8cb5b6ba252b5ac5 /sound/soc/fsl/imx-spdif.c | |
| parent | 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52 (diff) | |
| parent | 12850b8d45cb03239ede6df58ad0022aba3f3dc2 (diff) | |
| download | linux-092d40505202ebc9fdfa5582f469458c7dd62257.tar.bz2 | |
Merge remote-tracking branch 'asoc/fix/arizona' into asoc-linus
Diffstat (limited to 'sound/soc/fsl/imx-spdif.c')
| -rw-r--r-- | sound/soc/fsl/imx-spdif.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/fsl/imx-spdif.c b/sound/soc/fsl/imx-spdif.c index 816013b0ebba..8499d5292f08 100644 --- a/sound/soc/fsl/imx-spdif.c +++ b/sound/soc/fsl/imx-spdif.c @@ -87,7 +87,7 @@ static int imx_spdif_audio_probe(struct platform_device *pdev) if (ret) goto error_dir; - ret = snd_soc_register_card(&data->card); + ret = devm_snd_soc_register_card(&pdev->dev, &data->card); if (ret) { dev_err(&pdev->dev, "snd_soc_register_card failed: %d\n", ret); goto error_dir; @@ -119,8 +119,6 @@ static int imx_spdif_audio_remove(struct platform_device *pdev) if (data->txdev) platform_device_unregister(data->txdev); - snd_soc_unregister_card(&data->card); - return 0; } |