mirror of
https://github.com/edk2-porting/linux-next.git
synced 2025-01-05 20:24:09 +08:00
Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus
This commit is contained in:
commit
8516e6483b
@ -62,7 +62,7 @@ static int imx_sgtl5000_probe(struct platform_device *pdev)
|
|||||||
struct device_node *ssi_np, *codec_np;
|
struct device_node *ssi_np, *codec_np;
|
||||||
struct platform_device *ssi_pdev;
|
struct platform_device *ssi_pdev;
|
||||||
struct i2c_client *codec_dev;
|
struct i2c_client *codec_dev;
|
||||||
struct imx_sgtl5000_data *data;
|
struct imx_sgtl5000_data *data = NULL;
|
||||||
int int_port, ext_port;
|
int int_port, ext_port;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
@ -128,7 +128,7 @@ static int imx_sgtl5000_probe(struct platform_device *pdev)
|
|||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
|
|
||||||
data->codec_clk = devm_clk_get(&codec_dev->dev, NULL);
|
data->codec_clk = clk_get(&codec_dev->dev, NULL);
|
||||||
if (IS_ERR(data->codec_clk)) {
|
if (IS_ERR(data->codec_clk)) {
|
||||||
ret = PTR_ERR(data->codec_clk);
|
ret = PTR_ERR(data->codec_clk);
|
||||||
goto fail;
|
goto fail;
|
||||||
@ -172,6 +172,8 @@ static int imx_sgtl5000_probe(struct platform_device *pdev)
|
|||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
fail:
|
fail:
|
||||||
|
if (data && !IS_ERR(data->codec_clk))
|
||||||
|
clk_put(data->codec_clk);
|
||||||
if (ssi_np)
|
if (ssi_np)
|
||||||
of_node_put(ssi_np);
|
of_node_put(ssi_np);
|
||||||
if (codec_np)
|
if (codec_np)
|
||||||
@ -185,6 +187,7 @@ static int imx_sgtl5000_remove(struct platform_device *pdev)
|
|||||||
struct imx_sgtl5000_data *data = platform_get_drvdata(pdev);
|
struct imx_sgtl5000_data *data = platform_get_drvdata(pdev);
|
||||||
|
|
||||||
snd_soc_unregister_card(&data->card);
|
snd_soc_unregister_card(&data->card);
|
||||||
|
clk_put(data->codec_clk);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user