Merge tag 'sound-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[sfrench/cifs-2.6.git] / sound / soc / rockchip / rk3288_hdmi_analog.c

diff --git a/sound/soc/rockchip/rk3288_hdmi_analog.c b/sound/soc/rockchip/rk3288_hdmi_analog.c
index bcdeddeba80c95d3d7df876acdaf3aaaaefcf12b..0c6bd9a019dbe8b333faee825bac211ff930f38d 100644 (file)
--- a/sound/soc/rockchip/rk3288_hdmi_analog.c
+++ b/sound/soc/rockchip/rk3288_hdmi_analog.c
@@ -169,7 +169,7 @@ static struct snd_soc_card snd_soc_card_rk = {
 
 static int snd_rk_mc_probe(struct platform_device *pdev)
 {
-       int ret = 0;
+       int ret;
        struct snd_soc_card *card = &snd_soc_card_rk;
        struct device_node *np = pdev->dev.of_node;
        struct rk_drvdata *machine;
@@ -253,7 +253,7 @@ static int snd_rk_mc_probe(struct platform_device *pdev)
                return dev_err_probe(&pdev->dev, ret,
                                     "Soc register card failed\n");
 
-       return ret;
+       return 0;
 }
 
 static const struct of_device_id rockchip_sound_of_match[] = {