Merge tag 'tags/bcm2835-dt-fixes-2020-03-27' into devicetree/fixes

[linux.git] / drivers / mtd / lpddr / lpddr_cmds.c

diff --git a/drivers/mtd/lpddr/lpddr_cmds.c b/drivers/mtd/lpddr/lpddr_cmds.c
index 1efc643c9871c02209011422da8d30be9f1120a4..fb1cbc9a2870f1ec707b15451c545327c2d290a1 100644 (file)
--- a/drivers/mtd/lpddr/lpddr_cmds.c
+++ b/drivers/mtd/lpddr/lpddr_cmds.c
@@ -68,7 +68,6 @@ struct mtd_info *lpddr_cmdset(struct map_info *map)
        shared = kmalloc_array(lpddr->numchips, sizeof(struct flchip_shared),
                                                GFP_KERNEL);
        if (!shared) {
-               kfree(lpddr);
                kfree(mtd);
                return NULL;
        }
@@ -305,8 +304,7 @@ static int chip_ready(struct map_info *map, struct flchip *chip, int mode)
                /* Only if there's no operation suspended... */
                if (mode == FL_READY && chip->oldstate == FL_READY)
                        return 0;
-               /* fall through */
-
+               fallthrough;
        default:
 sleep:
                set_current_state(TASK_UNINTERRUPTIBLE);