From 0e6bfbab3d3802a7737abad50e0185f75143319e Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Sat, 27 Sep 2008 20:30:52 +0200 Subject: [PATCH] --- yaml --- r: 110060 b: refs/heads/master c: 9778e9a0eafe796c2affcd1fa1fa8a3765e026e6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/cs4270.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index c211cea3031e..7cbc76ccd895 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ec2cd95f340fb07b905839ee219b3846ecf58396 +refs/heads/master: 9778e9a0eafe796c2affcd1fa1fa8a3765e026e6 diff --git a/trunk/sound/soc/codecs/cs4270.c b/trunk/sound/soc/codecs/cs4270.c index 82d94f00aa45..d68650de39bc 100644 --- a/trunk/sound/soc/codecs/cs4270.c +++ b/trunk/sound/soc/codecs/cs4270.c @@ -610,17 +610,12 @@ static int cs4270_i2c_probe(struct i2c_client *i2c_client, return 0; error: - if (codec->control_data) { - i2c_detach_client(i2c_client); - codec->control_data = NULL; - } + codec->control_data = NULL; kfree(codec->reg_cache); codec->reg_cache = NULL; codec->reg_cache_size = 0; - kfree(i2c_client); - return ret; }