Преглед изворни кода

mtd: nand: vf610: return error code of nand_scan_ident/tail() on error

The nand_scan_ident/tail() returns an appropriate error value when
it fails.  Use it instead of the fixed error code -ENXIO.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Masahiro Yamada пре 9 година
родитељ
комит
e9d354b4b2
1 измењених фајлова са 4 додато и 6 уклоњено
  1. 4 6
      drivers/mtd/nand/vf610_nfc.c

+ 4 - 6
drivers/mtd/nand/vf610_nfc.c

@@ -717,10 +717,9 @@ static int vf610_nfc_probe(struct platform_device *pdev)
 	vf610_nfc_preinit_controller(nfc);
 	vf610_nfc_preinit_controller(nfc);
 
 
 	/* first scan to find the device and get the page size */
 	/* first scan to find the device and get the page size */
-	if (nand_scan_ident(mtd, 1, NULL)) {
-		err = -ENXIO;
+	err = nand_scan_ident(mtd, 1, NULL);
+	if (err)
 		goto error;
 		goto error;
-	}
 
 
 	vf610_nfc_init_controller(nfc);
 	vf610_nfc_init_controller(nfc);
 
 
@@ -775,10 +774,9 @@ static int vf610_nfc_probe(struct platform_device *pdev)
 	}
 	}
 
 
 	/* second phase scan */
 	/* second phase scan */
-	if (nand_scan_tail(mtd)) {
-		err = -ENXIO;
+	err = nand_scan_tail(mtd);
+	if (err)
 		goto error;
 		goto error;
-	}
 
 
 	platform_set_drvdata(pdev, mtd);
 	platform_set_drvdata(pdev, mtd);