diff options
| author | Mark Brown <broonie@kernel.org> | 2020-06-17 14:39:12 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-06-17 14:39:12 +0300 |
| commit | 6870112c46c867f50cd27570860a05bd82614b5c (patch) | |
| tree | bd9f13f6ab25072809564460a34bf0fb40900069 /drivers/mtd/nand/raw/hisi504_nand.c | |
| parent | 6f1cf5257acc6e6242ddf2f52bc7912aed77b79f (diff) | |
| parent | b3a9e3b9622ae10064826dccb4f7a52bd88c7407 (diff) | |
| download | linux-6870112c46c867f50cd27570860a05bd82614b5c.tar.xz | |
Merge tag 'v5.8-rc1' into regulator-5.8
Linux 5.8-rc1
Diffstat (limited to 'drivers/mtd/nand/raw/hisi504_nand.c')
| -rw-r--r-- | drivers/mtd/nand/raw/hisi504_nand.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/mtd/nand/raw/hisi504_nand.c b/drivers/mtd/nand/raw/hisi504_nand.c index 0b48be54ba6f..b84238e2268a 100644 --- a/drivers/mtd/nand/raw/hisi504_nand.c +++ b/drivers/mtd/nand/raw/hisi504_nand.c @@ -806,8 +806,12 @@ static int hisi_nfc_probe(struct platform_device *pdev) static int hisi_nfc_remove(struct platform_device *pdev) { struct hinfc_host *host = platform_get_drvdata(pdev); + struct nand_chip *chip = &host->chip; + int ret; - nand_release(&host->chip); + ret = mtd_device_unregister(nand_to_mtd(chip)); + WARN_ON(ret); + nand_cleanup(chip); return 0; } |