From: Richard Weinberger <richard@nod.at>
Date: Mon, 1 Aug 2022 19:24:54 +0000 (+0200)
Subject: Merge remote-tracking branch 'korg_git/nand/next' into mtd/next
X-Git-Tag: v6.0-rc1~99^2~2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=e8166841a6996ac837caa24ee0da9d3f1eaad7be;p=linux-block.git

Merge remote-tracking branch 'korg_git/nand/next' into mtd/next
---

e8166841a6996ac837caa24ee0da9d3f1eaad7be
diff --cc drivers/mtd/nand/raw/meson_nand.c
index 4e6d1a6a19c7,032180183339..829b76b303aa
--- a/drivers/mtd/nand/raw/meson_nand.c
+++ b/drivers/mtd/nand/raw/meson_nand.c
@@@ -1302,9 -1303,10 +1302,8 @@@ static void meson_nfc_nand_chip_cleanup
  		meson_chip = list_first_entry(&nfc->chips,
  					      struct meson_nfc_nand_chip, node);
  		mtd = nand_to_mtd(&meson_chip->nand);
 -		ret = mtd_device_unregister(mtd);
 -		if (ret)
 -			return ret;
 +		WARN_ON(mtd_device_unregister(mtd));
  
- 		meson_nfc_free_buffer(&meson_chip->nand);
  		nand_cleanup(&meson_chip->nand);
  		list_del(&meson_chip->node);
  	}