diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-11-04 11:42:52 +0100 |
|---|---|---|
| committer | Boris Brezillon <boris.brezillon@free-electrons.com> | 2016-11-07 14:48:43 +0100 |
| commit | 408bf51e92752d084d82d21e2c1f838d0ecc5eea (patch) | |
| tree | b7fef362bcf53109b1b1e7e327494ab0bd1a0cf3 /drivers | |
| parent | mtd: nand: cs553x: return error code of nand_scan() on error (diff) | |
| download | linux-408bf51e92752d084d82d21e2c1f838d0ecc5eea.tar.xz linux-408bf51e92752d084d82d21e2c1f838d0ecc5eea.zip | |
mtd: nand: gpio: return error code of nand_scan() on error
The nand_scan() 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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/nand/gpio.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/mtd/nand/gpio.c b/drivers/mtd/nand/gpio.c index 6317f6836022..0d24857469ab 100644 --- a/drivers/mtd/nand/gpio.c +++ b/drivers/mtd/nand/gpio.c @@ -286,10 +286,9 @@ static int gpio_nand_probe(struct platform_device *pdev) if (gpio_is_valid(gpiomtd->plat.gpio_nwp)) gpio_direction_output(gpiomtd->plat.gpio_nwp, 1); - if (nand_scan(mtd, 1)) { - ret = -ENXIO; + ret = nand_scan(mtd, 1); + if (ret) goto err_wp; - } if (gpiomtd->plat.adjust_parts) gpiomtd->plat.adjust_parts(&gpiomtd->plat, mtd->size); |