Merge 3.4-rc5 into staging-next

[karo-tx-linux.git] / drivers / staging / android / persistent_ram.c

diff --git a/drivers/staging/android/persistent_ram.c b/drivers/staging/android/persistent_ram.c
index ce710f9989df7f19d4c09bbf0703a980e40e545e..8407112f701f9aa1903c30a0b3cfa628049eea33 100644 (file)
--- a/drivers/staging/android/persistent_ram.c
+++ b/drivers/staging/android/persistent_ram.c
@@ -399,12 +399,12 @@ static  __init
 struct persistent_ram_zone *__persistent_ram_init(struct device *dev, bool ecc)
 {
        struct persistent_ram_zone *prz;
-       int ret;
+       int ret = -ENOMEM;
 
        prz = kzalloc(sizeof(struct persistent_ram_zone), GFP_KERNEL);
        if (!prz) {
                pr_err("persistent_ram: failed to allocate persistent ram zone\n");
-               return ERR_PTR(-ENOMEM);
+               goto err;
        }
 
        INIT_LIST_HEAD(&prz->node);
@@ -412,13 +412,13 @@ struct persistent_ram_zone *__persistent_ram_init(struct device *dev, bool ecc)
        ret = persistent_ram_buffer_init(dev_name(dev), prz);
        if (ret) {
                pr_err("persistent_ram: failed to initialize buffer\n");
-               return ERR_PTR(ret);
+               goto err;
        }
 
        prz->ecc = ecc;
        ret = persistent_ram_init_ecc(prz, prz->buffer_size);
        if (ret)
-               return ERR_PTR(ret);
+               goto err;
 
        if (prz->buffer->sig == PERSISTENT_RAM_SIG) {
                if (buffer_size(prz) > prz->buffer_size ||
@@ -442,6 +442,9 @@ struct persistent_ram_zone *__persistent_ram_init(struct device *dev, bool ecc)
        atomic_set(&prz->buffer->size, 0);
 
        return prz;
+err:
+       kfree(prz);
+       return ERR_PTR(ret);
 }
 
 struct persistent_ram_zone * __init