Commit 6d12075d authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'mtd/fixes-for-5.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux

Pull MTD fixes from Miquel Raynal:
 "MTD:
   - Set a missing master partition panic write flag

  Raw NAND:
   - Fix build issue in the xway driver
   - Fix a wrong return code"

* tag 'mtd/fixes-for-5.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux:
  mtd: rawnand: xway: Fix build issue
  mtd: set master partition panic write flag
  nandsim: Fix return code testing of ns_find_operation()
parents aa27b32b 880bc529
...@@ -1273,8 +1273,8 @@ int mtd_panic_write(struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, ...@@ -1273,8 +1273,8 @@ int mtd_panic_write(struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen,
return -EROFS; return -EROFS;
if (!len) if (!len)
return 0; return 0;
if (!mtd->oops_panic_write) if (!master->oops_panic_write)
mtd->oops_panic_write = true; master->oops_panic_write = true;
return master->_panic_write(master, mtd_get_master_ofs(mtd, to), len, return master->_panic_write(master, mtd_get_master_ofs(mtd, to), len,
retlen, buf); retlen, buf);
......
...@@ -1761,7 +1761,7 @@ static void ns_switch_state(struct nandsim *ns) ...@@ -1761,7 +1761,7 @@ static void ns_switch_state(struct nandsim *ns)
NS_DBG("switch_state: operation is unknown, try to find it\n"); NS_DBG("switch_state: operation is unknown, try to find it\n");
if (!ns_find_operation(ns, 0)) if (ns_find_operation(ns, 0))
return; return;
if ((ns->state & ACTION_MASK) && if ((ns->state & ACTION_MASK) &&
......
...@@ -224,7 +224,7 @@ static int xway_nand_remove(struct platform_device *pdev) ...@@ -224,7 +224,7 @@ static int xway_nand_remove(struct platform_device *pdev)
struct nand_chip *chip = &data->chip; struct nand_chip *chip = &data->chip;
int ret; int ret;
ret = mtd_device_unregister(mtd); ret = mtd_device_unregister(nand_to_mtd(chip));
WARN_ON(ret); WARN_ON(ret);
nand_cleanup(chip); nand_cleanup(chip);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment