[PATCH v2] ASoC: rockchip: fix a misjudgement by return

[PATCH v2] ASoC: rockchip: fix a misjudgement by return

[Xing Zheng]

Being careless, judge the return value of snd_soc_card_jack_new
is opposite, so it should be fixed.

---

Changes in v2:
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Reviewed-by: Dylan Reid <dgreid@chromium.org>

 sound/soc/rockchip/rockchip_rt5645.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/rockchip/rockchip_rt5645.c b/sound/soc/rockchip/rockchip_rt5645.c
index 3c6bb1e..adfe98c 100644
--- 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;
 	}
-- 
1.7.9.5

Re: [PATCH v2] ASoC: rockchip: fix a misjudgement by return

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 312 bytes --]

On Wed, Aug 26, 2015 at 11:20:44AM +0800, Xing Zheng wrote:
> Being careless, judge the return value of snd_soc_card_jack_new
> is opposite, so it should be fixed.

This patch has been applied already.  If any changes are required to
already applied patches please send incremental patches against current
code.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]