X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fath79%2Ffiles%2Fdrivers%2Fmtd%2Fnand%2Fraw%2Fnand_rb4xx.c;fp=target%2Flinux%2Fath79%2Ffiles%2Fdrivers%2Fmtd%2Fnand%2Fraw%2Fnand_rb4xx.c;h=382af09978a55309eb9b39ab696f394a27c714a2;hb=6062d858929df927e244280ec4864b35a217d6d1;hp=922d7095cb6348cc518b3450288fc48d8c521019;hpb=ce958dd88a7e74cd7aa7c345c97c79556bc2d926;p=openwrt%2Fopenwrt.git

diff --git a/target/linux/ath79/files/drivers/mtd/nand/raw/nand_rb4xx.c b/target/linux/ath79/files/drivers/mtd/nand/raw/nand_rb4xx.c
index 922d7095cb..382af09978 100644
--- a/target/linux/ath79/files/drivers/mtd/nand/raw/nand_rb4xx.c
+++ b/target/linux/ath79/files/drivers/mtd/nand/raw/nand_rb4xx.c
@@ -232,7 +232,11 @@ static int rb4xx_nand_probe(struct platform_device *pdev)
 	nand->chip.dev_ready	= rb4xx_nand_dev_ready;
 	nand->chip.chip_delay	= 25;
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,19,130)
 	ret = nand_scan(mtd, 1);
+#else
+	ret = nand_scan(&nand->chip, 1);
+#endif
 #else
 	nand->chip.legacy.read_byte	= rb4xx_nand_read_byte;
 	nand->chip.legacy.write_buf	= rb4xx_nand_write_buf;
@@ -248,11 +252,7 @@ static int rb4xx_nand_probe(struct platform_device *pdev)
 
 	ret = mtd_device_register(mtd, NULL, 0);
 	if (ret) {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4,20,0)
-		nand_release(mtd);
-#else
 		nand_release(&nand->chip);
-#endif
 		return ret;
 	}
 
@@ -263,11 +263,7 @@ static int rb4xx_nand_remove(struct platform_device *pdev)
 {
 	struct rb4xx_nand *nand = platform_get_drvdata(pdev);
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4,20,0)
-	nand_release(nand_to_mtd(&nand->chip));
-#else
 	nand_release(&nand->chip);
-#endif
 
 	return 0;
 }