diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-11-04 19:43:06 +0900 |
|---|---|---|
| committer | Boris Brezillon <boris.brezillon@free-electrons.com> | 2016-11-07 14:48:51 +0100 |
| commit | 72480e4e9537fe7c8b9ccc980873665676002808 (patch) | |
| tree | 3168c8adc548e483922db73a1618c70260ef704a /drivers/mtd/nand | |
| parent | e9d354b4b26aa8fe18b3a6858f2161a43a040e1f (diff) | |
| download | op-kernel-dev-72480e4e9537fe7c8b9ccc980873665676002808.zip op-kernel-dev-72480e4e9537fe7c8b9ccc980873665676002808.tar.gz | |
mtd: nand: cafe: return error code of nand_scan_ident() on error
The nand_scan_ident() returns an appropriate error value when it
fails. Use it instead of the fixed error code -ENXIO.
(This driver is already doing so for nand_scan_tail().)
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/mtd/nand')
| -rw-r--r-- | drivers/mtd/nand/cafe_nand.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/mtd/nand/cafe_nand.c b/drivers/mtd/nand/cafe_nand.c index 0b0c937..d40c32d 100644 --- a/drivers/mtd/nand/cafe_nand.c +++ b/drivers/mtd/nand/cafe_nand.c @@ -725,10 +725,9 @@ static int cafe_nand_probe(struct pci_dev *pdev, usedma = 0; /* Scan to find existence of the device */ - if (nand_scan_ident(mtd, 2, NULL)) { - err = -ENXIO; + err = nand_scan_ident(mtd, 2, NULL); + if (err) goto out_irq; - } cafe->dmabuf = dma_alloc_coherent(&cafe->pdev->dev, 2112 + sizeof(struct nand_buffers) + |
