Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux-2.6-block.git] / sound / i2c / other / ak4113.c

diff --git a/sound/i2c/other/ak4113.c b/sound/i2c/other/ak4113.c
index 88844881cbff99179eb68f6aff288598945d07c7..2183e9ebaa6df14f7fbc7ce3a45353c81ce7d186 100644 (file)
--- a/sound/i2c/other/ak4113.c
+++ b/sound/i2c/other/ak4113.c
@@ -73,7 +73,7 @@ int snd_ak4113_create(struct snd_card *card, ak4113_read_t *read,
                void *private_data, struct ak4113 **r_ak4113)
 {
        struct ak4113 *chip;
-       int err = 0;
+       int err;
        unsigned char reg;
        static struct snd_device_ops ops = {
                .dev_free =     snd_ak4113_dev_free,
@@ -109,7 +109,7 @@ int snd_ak4113_create(struct snd_card *card, ak4113_read_t *read,
 
 __fail:
        snd_ak4113_free(chip);
-       return err < 0 ? err : -EIO;
+       return err;
 }
 EXPORT_SYMBOL_GPL(snd_ak4113_create);