diff options
Diffstat (limited to 'sound/soc/fsl/imx-sgtl5000.c')
| -rw-r--r-- | sound/soc/fsl/imx-sgtl5000.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/fsl/imx-sgtl5000.c b/sound/soc/fsl/imx-sgtl5000.c index ca1be1d9dcf0..f2beae78969f 100644 --- a/sound/soc/fsl/imx-sgtl5000.c +++ b/sound/soc/fsl/imx-sgtl5000.c | |||
| @@ -159,7 +159,7 @@ static int imx_sgtl5000_probe(struct platform_device *pdev) | |||
| 159 | data->card.dapm_widgets = imx_sgtl5000_dapm_widgets; | 159 | data->card.dapm_widgets = imx_sgtl5000_dapm_widgets; |
| 160 | data->card.num_dapm_widgets = ARRAY_SIZE(imx_sgtl5000_dapm_widgets); | 160 | data->card.num_dapm_widgets = ARRAY_SIZE(imx_sgtl5000_dapm_widgets); |
| 161 | 161 | ||
| 162 | ret = snd_soc_register_card(&data->card); | 162 | ret = devm_snd_soc_register_card(&pdev->dev, &data->card); |
| 163 | if (ret) { | 163 | if (ret) { |
| 164 | dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret); | 164 | dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret); |
| 165 | goto fail; | 165 | goto fail; |
| @@ -186,7 +186,6 @@ static int imx_sgtl5000_remove(struct platform_device *pdev) | |||
| 186 | { | 186 | { |
| 187 | struct imx_sgtl5000_data *data = platform_get_drvdata(pdev); | 187 | struct imx_sgtl5000_data *data = platform_get_drvdata(pdev); |
| 188 | 188 | ||
| 189 | snd_soc_unregister_card(&data->card); | ||
| 190 | clk_put(data->codec_clk); | 189 | clk_put(data->codec_clk); |
| 191 | 190 | ||
| 192 | return 0; | 191 | return 0; |
| @@ -202,6 +201,7 @@ static struct platform_driver imx_sgtl5000_driver = { | |||
| 202 | .driver = { | 201 | .driver = { |
| 203 | .name = "imx-sgtl5000", | 202 | .name = "imx-sgtl5000", |
| 204 | .owner = THIS_MODULE, | 203 | .owner = THIS_MODULE, |
| 204 | .pm = &snd_soc_pm_ops, | ||
| 205 | .of_match_table = imx_sgtl5000_dt_ids, | 205 | .of_match_table = imx_sgtl5000_dt_ids, |
| 206 | }, | 206 | }, |
| 207 | .probe = imx_sgtl5000_probe, | 207 | .probe = imx_sgtl5000_probe, |
