ASoC: Samsung: Rename from s3c24xx to samsung

[deliverable/linux.git] / sound / soc / codecs / alc5623.c

diff --git a/sound/soc/codecs/alc5623.c b/sound/soc/codecs/alc5623.c
index 5a45067b43ba86871d3e67105bcbe4b86c026c8a..9783e7e2eb93ae1612da71a99a53537e861a6c8e 100644 (file)
--- a/sound/soc/codecs/alc5623.c
+++ b/sound/soc/codecs/alc5623.c
@@ -28,7 +28,6 @@
 #include <sound/pcm_params.h>
 #include <sound/tlv.h>
 #include <sound/soc.h>
-#include <sound/soc-dapm.h>
 #include <sound/initval.h>
 #include <sound/alc5623.h>
 
@@ -1023,10 +1022,8 @@ static int alc5623_i2c_probe(struct i2c_client *client,
        dev_dbg(&client->dev, "Found codec id : alc56%02x\n", vid2);
 
        alc5623 = kzalloc(sizeof(struct alc5623_priv), GFP_KERNEL);
-       if (alc5623 == NULL) {
-               ret = -ENOMEM;
-               goto err;
-       }
+       if (alc5623 == NULL)
+               return -ENOMEM;
 
        pdata = client->dev.platform_data;
        if (pdata) {
@@ -1057,12 +1054,9 @@ static int alc5623_i2c_probe(struct i2c_client *client,
                &soc_codec_device_alc5623, &alc5623_dai, 1);
        if (ret != 0) {
                dev_err(&client->dev, "Failed to register codec: %d\n", ret);
-               goto err;
+               kfree(alc5623);
        }
 
-       return 0;
-
-err:
        return ret;
 }