ASoC: Fix WM8960 leaks on probe failure (1a01417e) · Commits · e / devices / android_kernel_fairphone_FP4

sound/soc/codecs/wm8960.c

+11 −5

Original line number	Diff line number	Diff line
		@@ -810,7 +810,8 @@ static int wm8960_register(struct wm8960_priv *wm8960)

		if (wm8960_codec) {
		dev_err(codec->dev, "Another WM8960 is registered\n");
		return -EINVAL;
		ret = -EINVAL;
		goto err;
		}

		if (!pdata) {
		@@ -843,7 +844,7 @@ static int wm8960_register(struct wm8960_priv *wm8960)
		ret = wm8960_reset(codec);
		if (ret < 0) {
		dev_err(codec->dev, "Failed to issue reset\n");
		return ret;
		goto err;
		}

		wm8960_dai.dev = codec->dev;
		@@ -877,17 +878,22 @@ static int wm8960_register(struct wm8960_priv *wm8960)
		ret = snd_soc_register_codec(codec);
		if (ret != 0) {
		dev_err(codec->dev, "Failed to register codec: %d\n", ret);
		return ret;
		goto err;
		}

		ret = snd_soc_register_dai(&wm8960_dai);
		if (ret != 0) {
		dev_err(codec->dev, "Failed to register DAI: %d\n", ret);
		snd_soc_unregister_codec(codec);
		return ret;
		goto err_codec;
		}

		return 0;

		err_codec:
		snd_soc_unregister_codec(codec);
		err:
		kfree(wm8960);
		return ret;
		}

		static void wm8960_unregister(struct wm8960_priv *wm8960)