Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03b0dc02 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.35' into for-2.6.36

parents 0c74a939 cecb66fd

sound/soc/codecs/wm8727.c

+2 −0
Original line number Diff line number Diff line
@@ -127,6 +127,8 @@ static __devinit int wm8727_platform_probe(struct platform_device *pdev) 
		goto err_codec;

	}



	return 0;



err_codec:

	snd_soc_unregister_codec(codec);

err:

sound/soc/codecs/wm8988.c

+0 −1
Original line number Diff line number Diff line
@@ -885,7 +885,6 @@ static int wm8988_register(struct wm8988_priv *wm8988, 
	ret = snd_soc_register_dai(&wm8988_dai);

	if (ret != 0) {

		dev_err(codec->dev, "Failed to register DAI: %d\n", ret);

		snd_soc_unregister_codec(codec);

		goto err_codec;

	}