mtd: mtdoops: Don't write panic data twice

[ Upstream commit c1cf1d57d1492235309111ea6a900940213a9166 ]

If calling mtdoops_write, don't also schedule work to be done later.

Although this appears to not be causing an issue, possibly because the
scheduled work will never get done, it is confusing.

Fixes: 016c1291ce70 ("mtd: mtdoops: do not use mtd->panic_write directly")
Signed-off-by: Mark Tomlinson <mark.tomlinson@alliedtelesis.co.nz>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20200903034217.23079-1-mark.tomlinson@alliedtelesis.co.nz
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/mtd/mtdoops.c b/drivers/mtd/mtdoops.c
index 97bb8f6304d4feebe6f38e357ca39a6a37fc7f71..09165eaac7a1544a84612e703336b1fa6415d35c 100644 (file)
--- a/drivers/mtd/mtdoops.c
+++ b/drivers/mtd/mtdoops.c
@@ -313,12 +313,13 @@ static void mtdoops_do_dump(struct kmsg_dumper *dumper,
        kmsg_dump_get_buffer(dumper, true, cxt->oops_buf + MTDOOPS_HEADER_SIZE,
                             record_size - MTDOOPS_HEADER_SIZE, NULL);
 
-       /* Panics must be written immediately */
-       if (reason != KMSG_DUMP_OOPS)
+       if (reason != KMSG_DUMP_OOPS) {
+               /* Panics must be written immediately */
                mtdoops_write(cxt, 1);
-
-       /* For other cases, schedule work to write it "nicely" */
-       schedule_work(&cxt->work_write);
+       } else {
+               /* For other cases, schedule work to write it "nicely" */
+               schedule_work(&cxt->work_write);
+       }
 }
 
 static void mtdoops_notify_add(struct mtd_info *mtd)