From 805003f3487476b3ae8eb0430bc1c0c580ceff9b Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Fri, 23 Jul 2010 05:53:45 +0000 Subject: [PATCH] --- yaml --- r: 206637 b: refs/heads/master c: 085efd28b65582fac459359672421a1c479e7db1 h: refs/heads/master i: 206635: 5095bb4431792a03b0d04dfe6def4a62542f6bde v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/da7210.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e837387e0013..4a49663d95d6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7bcaad919bc7aaa084f5884aa15654fe1fa4c77f +refs/heads/master: 085efd28b65582fac459359672421a1c479e7db1 diff --git a/trunk/sound/soc/codecs/da7210.c b/trunk/sound/soc/codecs/da7210.c index 3e42d1e0e601..3c51d6a57523 100644 --- a/trunk/sound/soc/codecs/da7210.c +++ b/trunk/sound/soc/codecs/da7210.c @@ -499,7 +499,7 @@ static int da7210_init(struct da7210_priv *da7210) ret = snd_soc_register_dai(&da7210_dai); if (ret) { dev_err(codec->dev, "Failed to register DAI: %d\n", ret); - goto init_err; + goto codec_err; } /* FIXME @@ -585,6 +585,8 @@ static int da7210_init(struct da7210_priv *da7210) return ret; +codec_err: + snd_soc_unregister_codec(codec); init_err: kfree(codec->reg_cache); codec->reg_cache = NULL; @@ -612,8 +614,10 @@ static int __devinit da7210_i2c_probe(struct i2c_client *i2c, codec->control_data = i2c; ret = da7210_init(da7210); - if (ret < 0) + if (ret < 0) { pr_err("Failed to initialise da7210 audio codec\n"); + kfree(da7210); + } return ret; }