diff options
| author |   Dan Carpenter <dan.carpenter@oracle.com> | 2017-04-04 11:15:46 +0300 |
|---|---|---|
| committer |   Boris Brezillon <boris.brezillon@free-electrons.com> | 2017-04-25 14:18:39 +0200 |
| commit | 70106ddaf31150a57dc00b3d7d5167f693b521ef (patch) | |
| tree | 82a3e3ae0097c6fb61ad032c84ea084716f02a41 /drivers/mtd | |
| parent | mtd: nand: allow drivers to request minimum alignment for passed buffer (diff) | |
| download | linux-dev-70106ddaf31150a57dc00b3d7d5167f693b521ef.tar.xz linux-dev-70106ddaf31150a57dc00b3d7d5167f693b521ef.zip | |
mtd: nand: Fix a couple error codes
We accidentally return 1 on error instead of proper error codes.
Fixes: 07b23e3db9ed ("mtd: nand: Cleanup/rework the atmel_nand driver")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/atmel/nand-controller.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/nand/atmel/nand-controller.c b/drivers/mtd/nand/atmel/nand-controller.c index 80e2459f92f8..c11f358c6df6 100644 --- a/drivers/mtd/nand/atmel/nand-controller.c +++ b/drivers/mtd/nand/atmel/nand-controller.c @@ -1685,7 +1685,7 @@ static int atmel_nand_controller_init(struct atmel_nand_controller *nc, nc->smc = syscon_node_to_regmap(np); of_node_put(np); if (IS_ERR(nc->smc)) { - ret = IS_ERR(nc->smc); + ret = PTR_ERR(nc->smc); dev_err(dev, "Could not get SMC regmap (err = %d)\n", ret); return ret; } @@ -1718,7 +1718,7 @@ atmel_smc_nand_controller_init(struct atmel_smc_nand_controller *nc) nc->matrix = syscon_node_to_regmap(np); of_node_put(np); if (IS_ERR(nc->matrix)) { - ret = IS_ERR(nc->matrix); + ret = PTR_ERR(nc->matrix); dev_err(dev, "Could not get Matrix regmap (err = %d)\n", ret); return ret; } |