Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[platform/kernel/linux-rpi.git] / drivers / mtd / devices / phram.c

diff --git a/drivers/mtd/devices/phram.c b/drivers/mtd/devices/phram.c
index 931e5c2..087b5e8 100644 (file)
--- a/drivers/mtd/devices/phram.c
+++ b/drivers/mtd/devices/phram.c
@@ -148,10 +148,10 @@ static int parse_num64(uint64_t *num64, char *token)
                        switch (token[len - 2]) {
                        case 'G':
                                shift += 10;
-                               /* fall through */
+                               fallthrough;
                        case 'M':
                                shift += 10;
-                               /* fall through */
+                               fallthrough;
                        case 'k':
                                shift += 10;
                                token[len - 2] = 0;
@@ -243,22 +243,25 @@ static int phram_setup(const char *val)
 
        ret = parse_num64(&start, token[1]);
        if (ret) {
-               kfree(name);
                parse_err("illegal start address\n");
+               goto error;
        }
 
        ret = parse_num64(&len, token[2]);
        if (ret) {
-               kfree(name);
                parse_err("illegal device length\n");
+               goto error;
        }
 
        ret = register_device(name, start, len);
-       if (!ret)
-               pr_info("%s device: %#llx at %#llx\n", name, len, start);
-       else
-               kfree(name);
+       if (ret)
+               goto error;
+
+       pr_info("%s device: %#llx at %#llx\n", name, len, start);
+       return 0;
 
+error:
+       kfree(name);
        return ret;
 }