diff options
| author |   Jean Delvare <khali@linux-fr.org> | 2008-09-27 20:30:52 +0200 |
|---|---|---|
| committer |   Takashi Iwai <tiwai@suse.de> | 2008-09-29 12:53:24 +0200 |
| commit | 9778e9a0eafe796c2affcd1fa1fa8a3765e026e6 (patch) | |
| tree | 14cd62ae3a35a74d16fd770bf89af7ac311ab45c /sound | |
| parent | ALSA: make the CS4270 driver a new-style I2C driver (diff) | |
| download | linux-dev-9778e9a0eafe796c2affcd1fa1fa8a3765e026e6.tar.xz linux-dev-9778e9a0eafe796c2affcd1fa1fa8a3765e026e6.zip | |
ALSA: ASoC: Fix another cs4270 error path
Conversion to new-style i2c driver missed the error path of the
probe function. Fix it.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Timur Tabi <timur@freescale.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/cs4270.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sound/soc/codecs/cs4270.c b/sound/soc/codecs/cs4270.c index 82d94f00aa45..d68650de39bc 100644 --- a/sound/soc/codecs/cs4270.c +++ b/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; } |