Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu...

[firefly-linux-kernel-4.4.55.git] / sound / soc / rockchip / rockchip_rt5645.c

diff --git a/sound/soc/rockchip/rockchip_rt5645.c b/sound/soc/rockchip/rockchip_rt5645.c
index 09402799c8dccbb6a87af2e9fccbe765d4474e8c..68c62e4c23168a1e9e8656956ee9b83584892d18 100644 (file)
--- a/sound/soc/rockchip/rockchip_rt5645.c
+++ b/sound/soc/rockchip/rockchip_rt5645.c
@@ -118,7 +118,7 @@ static int rk_init(struct snd_soc_pcm_runtime *runtime)
                                    SND_JACK_BTN_0 | SND_JACK_BTN_1 |
                                    SND_JACK_BTN_2 | SND_JACK_BTN_3,
                                    &headset_jack, NULL, 0);
-       if (!ret) {
+       if (ret) {
                dev_err(card->dev, "New Headset Jack failed! (%d)\n", ret);
                return ret;
        }
@@ -212,7 +212,6 @@ static struct platform_driver snd_rk_mc_driver = {
        .probe = snd_rk_mc_probe,
        .driver = {
                .name = DRV_NAME,
-               .owner = THIS_MODULE,
                .pm = &snd_soc_pm_ops,
                .of_match_table = rockchip_rt5645_of_match,
        },